Doesn't break deinterleave and Fixes #8615 and #8570 for 2.0

(cherry-picked by hand from af3f8759a874eeda1af2ccd50d61028809bd3161)