Merge branch 'master' into dev/SE-216