Merge branch 'CURATOR-278' of https://github.com/granthenke/curator into CURATOR-278