I do agree the upgrade should be in a separate pull though. :smile: