VID-1582 Checkin for liz collab