Backport variable name change from master
The master
branch has much more strict requirements on variable naming. This backports one of those to 21.2 to keep the branches in sync.
The master
branch has much more strict requirements on variable naming. This backports one of those to 21.2 to keep the branches in sync.