Re-added trailing spaces to avoid merge conflicts