Merge "Use const reference instead of pointer"