Merge branch 'for-5.7-preferred-console' into for-next