Stop duplicate trigger events on advancedsettings page.
Merge branch 'release/2.11' into release/12.0