Merge pull request #3140 from esdrubal/syscall_details