DAM

Checkout
Tom The
committed
979
on 18 Jan 18
Refactored code.
Fix typo in TD

Related to Issue [MWDAM-1095]
978