OE-2727
Revert "OE-2727"

This reverts commit 829e6b3bac434f4ebc4257584b3d2cf81f1723c0.
Merge branch 'release/1.3-moorfields'
Merge branch 'master' into develop