Merge "MAP: Add developer option to control map version"