Merge "New Popup implementation" into devel/master