issue #21371 submitting change from attached patch