SN-35 Change generate mode for id
Merge remote-tracking branch 'origin/master'
SN-37 Fix bug