DAM

Checkout
Tom The
committed
1825
on 24 Aug 18
Adapted to review
Some code cleanup
Related to Issue [MWDAM-1289]