Merge "Test mapping changes can be made by anyone."