Merge pull request #31280 from sg00dwin/CONSOLE-5188-remove-console-exceptions