various updates
Merge remote-tracking branch 'origin/topic-maps-and-catalog' into topic-maps-and-catalog