JBDS-2623 refactor