Merge "Send error if ONS is not available" into qt-r1-dev