Merge "Use const reference when not modifying objects"