Merge "Add another flag to control turbulence noise in UMO." into tm-qpr-dev