Merge branch 'master' into PHOENIX-6883-feature