Fix Error when PopupAPI not loaded
Merge branch 'dev'