MAGN-551. Further work on render stripping.