Fixes for the v4.11 merge window.