Merge remote-tracking branch 'sstabellini/build_fix' into staging