[KFSQA-664] Removed @wip in preparation for master merge.