Commit to rev 10827