Jira task BCG-257

Final version of modifications to support both NE-1600 and NE-1002x devices;