Version history for #4315.
Bugfixes for #4314.