Merge tag 'v5.1-rc5' into for-5.2/block