Merge pull request #1042 from ie3-institute/sp/#0-merge-back-5.0.1

Merge back changes from 5.0.1 (#535)