Add expr_2021 macro fragment specifier
#1580
Merged
expr_2021 macro fragment specifier
#1580