#ROSE-49 Resolved