Little big refactoring related to ORG-1623