Merge branch 'rs/deflate-init-cleanup' into maint