Merge "Add entrypoint type information."