Basic Linux build merge on dev