[KFSQA-994] a couple more merge change