merge sil's latest changes