Popup windows were added
Merge branch 'PopupInfoWindow'