Merge from Eyal desktop
Merge branch 'Eyal' to master