Also including changes from master's e61276d1c7f245911afe3b61974f1616ef10f381