Merge "Revert^2 "Remove variants of vdm flag library"" into main