develop - bugzid 3954: fixed device ids