Merge "Zero jank IMF 3/N" into main