Merge #11403