Merge branch 'master' into DIRAPI-341