Linux-specific updates
Merge