Merge "Updated Doctor user configuration doc"