First commit of the latest Sprint (25) for MAT.