Merge "Updated Doctor user configuration doc" into stable/fraser