Merge with Maor_dev branch