Adapt for Core 4.0

assigned to @yuha

created branch 59-adapt-for-core-4-0 to address this issue

mentioned in merge request !130 (merged)

mentioned in commit 2409f2f2

closed with merge request !130 (merged)