Fixes WFE-745
Merge remote-tracking branch 'origin/develop' into wf4ever-develop