Applied change from rt #26235
Also fixed repo name