Merged ignore trailing separator char changes with valerius changes.