Fetch latest fixes from the main repo

Changesets fcd3765bcd2e, 9c58c0e28dc0, 9f24b25dfe99, 36c478bb1adc.