Update version to M5 and fix GADGETS-61