Adapt to core changes

assigned to @magicfelix

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

mentioned in merge request !421 (merged)

closed with merge request !421 (merged)

mentioned in commit f0fe4c81