Merge branch 'for-5.5-pr-warn' into for-5.5