I created a new inherit for this, maybe this is too cautious, but
just in case as I did not have any more time than version bump +
test build, here is the patch for the new version.