hotfix for core "Merge branch 1.8/develop..."