Merge "API council feedback for dnd"