[KFSQA-750] Ready for master merge.