Pull request  to sync up with sethusrinivasan:master to sethusrinivasan:dev