Merge remote-tracking branch 'remotes/philmd/tags/avr-20210315' into staging