merge release to 8.5; revert features not included in release
Restore selected code improvements that missed the 8.5.14 release.
merge-mark
make dist