Merge "Use Received Uri as Gateway Uri" into qt-dev