Merge "SF: Avoid allocation on hot path to IF"