Merge "Change how RTT pipes are set" into pi-dev