VID-1582 Partial work to share w/ Liz