Splitting Ioannis' work from CO-1327 for issue management purposes. Note the commit was labeled for CO-1327, but we want to keep that ticket open so resolution of his work is assigned to this subtask.