Merge "Fix api council feedback"