New version 2 that only works on D9 due to changes in plugin context definitions. Refinements and clean-ups for PHP7.4+
