Use consts instead of statics where appropriate
#22876
Merged
consts instead of statics where appropriate
#22876