fix #21168
fix #12112