Update 6.0.0 branch with lsof change