Merge remote-tracking branch 'remotes/armbru/tags/pull-error-2020-07-02' into staging