Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-misc-20210315' into staging