[sr-dev] git:master:e963851b: core: cleanup resolver defines, no function change