Proposed change aimed to keep coherence between variable declaration and static initialization code, which stores 9 values, not 8, in these two maps. Closes gh-27016
Proposed change aimed to keep coherence between variable declaration and static initialization code, which stores 9 values, not 8, in these two maps. Closes gh-27016