Merge "Remove unnecessary spacer" into main