Merge bug 26000 (into stable this time)
stable to default (noop)