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