Merge "Access credential fields as attributes"