Merge "Support parsing of ASCII/CLI files within Velocity and Jinja Template"