Merge branch 'develop' into sprint_14.2_3
Revert Josh's Container Listener changes
20542: Bar performance
Merge fix for 20542