Merge branch 'for-4.16-console-waiter-logic' into for-4.16