Merge remote-tracking branch 'remotes/philmd/tags/mips-20210413' into staging