Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-5.0-20200407' into staging