Merge branch 'master' into fix/scoping-merge