[KFSQA-649] Got it working for GEC!
[KFSQA-649] Got it working for AD!