Merge branch 'master' into 370793-jee6wp-support