SN-122 fix bugs
Merge remote-tracking branch 'origin/master'