merge from MAC
fix