Merge branch 'master' into advanced-containers