Merge pull request #13222 from lockiechen/feat_12805