[sr-dev] git:master:f229d221: core: rename local variable that hides global variable