Merge "Update overrides to support docs"