Merge branch 'CURATOR-367'