rpi: merged with master.