[KFSQA-753] Tagged for speed and removed @wip in preparation for master merge.