Merge "Update catapult to latest version (76a241669)"