initial commit [JBDS-2623] >> master