Add process and call checks
Merge commit '811c068fe1193a204fa6a65fc12c3b15adebb3e0'