Merge "Update timeout string" into qt-dev