initial commit [JBDS-2623]
JBDS-2623 refactor
JBDS-2623 refactor