Merge "Fixed permananent failure behaviors" into tm-qpr-dev