Commit 16.40 11/11/2014