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