Merge/test/fix on a separate branch and then merge this into main when the freeze lifts?