Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-fp-20210516' into staging