Merge remote-tracking branch 'origin/gc-improvement'

ober

05264127a90185d78efeb5cca33f05ae0bad6752