Resolved CORE-2156