Merge in changes

Merge in new changes to sync with hiawatha 9.8