Merge branch 'master' into CURATOR-287