Merge branch 'CURATOR-331' of https://github.com/julnamoo/curator into CURATOR-331