RPI Upstreaming