Merge "Update catapult and how we update catapult"