#ROSE-61 Resolved