Re #7537. Remove mutable, add const to member variable declaration.
Merge remote-tracking branch 'origin/feature/7537_tiny_ticket'