#ROSE-46 resolved
#ROSE-37 resolved