Change variable name
Merge branch 'release/12.0' into release/13.0

* release/12.0:
  Change variable name