[KFSQA-649] Should be ready for review, once again.