Merge branch 'CURATOR-215' into CURATOR-3.0