My fork incorporates adapted patches from Olivier Duchateau. PR: 270881 Sponsored by: Serenity Cybersecurity, LLC