merged sid-yash branches