Bug/dcb 68/folsom/master