Merge "Reapply "Finalize resources for VIC"" into main