Merge and fix #14732