Issue #12245 merge.