merge new fixes from sil