mmc: Sync with CAF jb_2.5