Merge "Check VDM flag before accessing" into main