Merge #9964: Add const to methods that do not modify the object for which it is called