Merge "Memory handling fixes [Issue-ID: ODUHIGH-337]"