Merge "Improved data fail cause debug message"