Co-authored-by: Victor Naumik <vicnaum@gmail.com>
This will be migrated to the modules repository after audit.