Merge "Fix public variables to not have 'm' prefix" into sc-v2-dev