[Golang-updates] [Bug 1404700] New: rebase needed