Merge 'master' into CURATOR-3.0