Merge #12228