Refactor add features (HEMERA-3715)
Merge branch 'HEMERA-3659-create-refactoring' into develop