Merge "Update to latest catapult (625dca847)"