Merge "Fix GC map generation edge case"