Merge "Update to latest catapult (e5abb7bd)"