Merge "Fix GC options to make the setting available"