Merge remote-tracking branch 'remotes/rth/tags/pull-fpu-20200515' into staging