on bug #4134, fixing silvertrace module's name
fixing bug #4134, improving code after profiling campaign
Merge branch 'core-5.11.x' into ney-bug4134
core #5.11.x :  Reformating the code