Merge in changes that already happened in the package #78

Closed dirkmueller closed 1 week ago