Merge "Remove 'm' from non-private fields"