Merge pull request #13394 from royalhuang/feat_10780_matrix_retry