Further additions for previous commit fix (DT-850)