[OE-2653] bugfix
Merge branch 'release/1.2-moorfields' into release/1.3-moorfields