Merge @asafdav new fixes