#ROSE-30 resolved
sanad melki bug resolved
#ROSE-48 resolved