Define class variables in classes.
Merge remote-tracking branch 'origin/pr/12' into 1.23.2