CURATOR-163 polishing