Moved this in to utils
Merge branch 'bug/acceptance-broken' into development