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