Remove wrong return.
test failed. reverted and corrected doc block instead for BC.
Merge remote-tracking branch 'origin/2.5' into vip-rita7-2.5