svn: r18106 original commit: 0920b493c84cf2e8306325bd98f5ae9759acdd51
svn: r16896 original commit: d28add0fa915e099e11fbd7ef44fb2e3e2c0ee40