[OE-3700] merge bugfix