Merge 'CURATOR-217' into CURATOR-3.0