no CHAR token in expanded form
auto-merge staging into master