Merge "Remove member "m" prefix from now local variables"