Merged patch for documentation strings from native branch