Vid 1821 release

PR to merge VID-1821 into release branch (cherry-picked after conflicts)