Merge "Increasing Penalty on UMO taps" into tm-qpr-dev