Brings in prod_v3 5084623 on top of production 9e8a236. Merged without conflicts: prod_v3's base (7ead60c) is an ancestor of production, and production's extra tab-bar refinements (17c7ae6) touch disjoint regions.
5084623
9e8a236
7ead60c
17c7ae6