Update 6.0.0 branch with lsof change

merging lsof change into 6.0.0 branch