Merge branch 'ibachar-master'