Merge "Making preExceptionHandler optional for plugins" into main