DDST-58: Updates post Adam's commit pull