Merge "fix dependency on modules-utils-build" into main