Fix DCB-22
Merge branch 'bug/DCB-22/betty/master' into feature/folsom/betty/master