[TASK] Add wrapper method for 7.0 compatibility
Merge pull request #718 from bjo3rnf/compat

[TASK] Add wrapper method for 7.0 compatibility