DDF-578

This is for DDF-578; I forgot to make the pull request at the same time