Rebased version (onto master) of original branch pointed in MR:
https://gitlab.syncad.com/hive/hive/-/merge_requests/new?merge_request%5Bsource_branch%5D=fix-sps-convert-vop-rebase