Clone
Michael Garthwaite
committed
on 30 Mar
LDT-2008: fixes from cherry picked commits.