Merge pull request #2904 from splitbrain/addCall