Merge branch 'master' into feature-namespace-subcomponents