#ROSE-107 resolved
refactoring