[SR-Dev] git:master: Define fixup_spve_null