Cleanup enhancement
Merge pull request #1471 from psav/dkb_meta

Cleanup enhancement