015.12 more text_parser alignment work