[OE-3681] merge from develop