Fix and test serviceCall EIP #2628, fix #2952
15 files changed