US543 - Add dynamic controllers map to all scenarios
Merge branch 'release' into release-work