Align recent changes in patches to master.