agenda, weight pop up, genericnavigationdelegate, popup protocol, ...
Merge remote-tracking branch 'origin'