Merge #15430

Fixes the spacing issues, tests already passed, just a lint fix