Backport today's changes to 1.3.