Merge from Mpdreamz