Merge branch 'CURATOR-479-2'