Merge "Replace non-const references by pointers"