DAM

Checkout
John Bokma
committed
6522
on 12 May
Adapted to review comments.
Related to Issue [MWDAM-2938]