Merge branch 'for-5.2-fixes' into for-5.3