KFSQA-865 pushing changes to finish other jira