Merge "Updates/fixes to memory settings" into mnc-dev