Integration full Muon Phase II

Merged pull requests for Muon Phase II