CORE-3491: some minor refactoring
Merge branch 'dev'