KFSQA-631 - pushing changes to work on other branch