Merge "Remove extra space between feature repos"