COBD commit 7/7/14