Merge "Refactor Turbulence noise" into tm-qpr-dev