Imported rpi branch snapshot