Cleanup of x224 before removing call to SubStream resize
Merge branch 'future' of github.com:wallix/redemption into future