Merge "Remove compilation warnings by removing illegal characters"