Rebased the v7-patches to fix git apply failure.
-- Best regards,Ilia Evdokimov,Tantor Labs LLC,https://tantorlabs.com/