[Backport 2.x] make common-utils core compatible after core #9082

[Backport 2.x] make common-utils core compatible after core #9082 #246