Merge from Eyal desktop