Merge "Improve PublishAttributes according to the API review"