Merge "Fix GC map generation edge case" into mnc-dev