Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-x86-20210519' into staging