#ROSE-84 resolved
#ROSE-68 resolved