IN PROGRESS - issue CORE-4191