svn: r12747 original commit: da7b6978eefdc1d476361cb56cbf577dbf32c825
svn: r12517 original commit: 66b9b932ef7d5b5eec53731ec7f196ba4d6b263f