Merge "Improved data fail cause debug message" into tm-dev