Merge "Updated Doctor feature configuration doc"