quick fix for MWEB-1013
Merge branch 'master' into dev
Resolved conflict with Palantir tests