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