(BugId:49650) Fix editor sometimes removing spaces when it shouldn't.
Merge branch 'bugid-49650' into dev