Merge "Check Exception Code for Service specific error" into tm-dev