* Ported commit 4586 from trunk