Merge branch 'jc/autogc' into js/rebase-i