MPD branch up to date with core