Merge "Change exception to log" into tm-qpr-dev