Merge with Yotam #2