BZ-9683 fixed data-toggle overriding event
Merge remote-tracking branch 'refs/remotes/origin/master'