Merge branch 'master' into pim-docs