SOD commit 2013-07-04