Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2021-03-16-tag' into staging