Merge "Added debug messages and watchdog" into qt-r1-dev