Merge pull request #3120 from esdrubal/syscall_details