Merge "Remove map usage via pointers"