Post merge

* Merging Sunanda's development with Muon development