Merge "Add flag for flagging new VIC settings work" into main