Merge branch 'procfs-cleanup' into release