Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-hex-20210306' into staging