Adapt to core changes

assigned to @magicfelix

created branch 42-adapt-to-core-changes to address this issue

mentioned in merge request !73 (merged)

mentioned in commit aa06b64f

closed with merge request !73 (merged)