Merge "Adding Character Spacing" into devel/master