Resolves #10923

Resolves #10923.

Rebased from #10930.