Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.1-20200720' into staging