Fix/4.0.x/ecms 5586