hotfix: iframe back button bug
Merge branch 'hotfix-iframe'