Porting Master PR #2819 to 2.5.x
Merge remote-tracking branch 'origin/2.5.x' into 2.5.x