@DirtiesContext
Additional code style cleanups in the affected classes **Auto-cherry-pick to `6.3.x` & `6.2.x`**