Merge "Add flag for VDM dump_history feature" into main