Merge "Update documentation related to configuration"