Add missing const for getters' parameter.
Merge remote-tracking branch 'origin'