Merge "Memory handling fixes"