KFSQA-628 pushing changes to grab master