Merge "Update to latest catapult (6171fd4d)"