[KFSQA-1012] Pushing changes for collaboration. This code version broken.