checkpoint for #20940 -mat5x