Merge branch 'SCM-811' to master