Merge branch '2021-09-30-whitespace-cleanups' into next