Merge pull request #5172 from kumpera/proc-handles-pt2