Branch force pushed by markfullmer at 2022-04-14T14:12:13+00:00, 3258394-performance-degradation-with moved from this tag to bab6717a07b0a40c63580010380f5f66ed99db58