Added initial commit for JBQA-7844