Merge "Simplify calculateEndTarget logic." into tm-qpr-dev