[Addresses #46570539, #46568429] plugin code updated to handle edge cases, bumping version to 4.1