[fulan] Fix stinit conflicts
Merge branch '2.4' of https://github.com/oe-alliance/oe-alliance-core into 2.4