Merge "Update to latest catapult (c69b7871)"