backport to 70X of the performance fix as #2347, already merged in 71X

Backport to 70X of the performance fix as in the pull request #2347, already merged in 71X
This module is not yet used in 70X/71X and it only serves for future HLT development: therefore, it cannot be tested now in a 70X release...