merge-update from trunk
Fixes #2418
Temporary fix for #2366; fixes #2368; Refactoring annotations in the name editor
Fixes #2366
had to rename the packages to make them compliant with buckminster