[KFSQA-839] Passed final review, merging with master.