Re-Sync to GC master Code

... some patch got lost when pushing (so original code is copied) and
correction is pushed again