Fix rpi

Merged Maxime Perrotin requested to merge fix_rpi into master

Merge request reports