Merge branch 'master' into ISSUE-5224