Bug 20600: (follow-up) Rebase on current master