Merge pull request #1864 from saper/procbyid