Merge "Check allocation" into mnc-dev