[sr-dev] git:master: core: Add fixup_pvar_uint helper function