Merge "Use a single library for interacting with vdm flags" into main