Device name check bug fix
Merge remote-tracking branch 'icesory/master' into development
reservedWords cleanup