Merge "Fix spacing issue"