Water Hammer Analysis

Hello all,

Could anyone please recommend some consultants that routinely carry out water hammer analysis, either on designs or on already built infrastructure? Preferably not companies that also market solutions!

Thanks in advance!