Merge branch 'master' into esegev
Various Tweaks
Merge branch 'esegev'