fixes for 1.8.7
Release 1.16.1