Re #7537. Remove mutable, add const to member variable declaration.
Merge branch 'feature/7537_tiny_ticket' into develop