rpi: Merged with master, untested yet.