[OE-3707] merged new change from develop branch