feat: Issue #3358150: Use apply spaceless