Merge "Add a flag for VCN safe mode configurability" into main