Optimized
Merge branch 'master' into Zeev

Merging zeev's code