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