Merge latest linux changes