Merge "Update to latest catapult (be85e5fd)"