Merged work:
- various workwork
- added experimental (unsupported) extra xml-menu items