Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-05-27' into staging