redirect to proper location
Merge remote-tracking branch 'origin/issue2951' into issue2951