Credit Chenguang Li for his patch, changelog the fix. References #15915.

Also some minor reshuffiing of the other changes.