KDUFFY-2679

KDUFFY-2679