Forward port VSV00016 fix from 6.0.x

Bug: T394004

Merge request reports

Loading