Merge "Update catapult to latest version (c4d3ff474)"