Rebase from alpha/12306