Merge with the ghiamar fork