Merge remote-tracking branch 'remotes/sstabellini/tags/xsa155' into staging