Merge pull request #1045 from TheBlueMatt/2021-08-chanmon-ser-upgradability