Merge branch 'rth7680-go-closure'