GEC error correction [KFSQA-653]
GEC error correction fixes [KFSQA-653]
Fixing review issues [KFSQA-653]
Merge branch 'master' into KFSQA-653