[sr-dev] git:master: core: fix fixup_pvar_pvar bug