Merge "Make sure user context map is ArrayMap, not Map" into sc-dev