Merge pull request #2663 from esdrubal/islocal