Merge branch 'sbogusev-master' into dev