Backport saturation buffer patches