[KFSQA-998] Merged to master.