Picked change from linux section.