chore: Try to reduce the number of duplicate issues of #3546 and #3546

chore: Try to reduce the number of duplicate issues of #3546 and #3546 #1096