release prep
Merge branch 'release/1.8.7'
Merge tag '1.8.7' into develop

CORS bug fixes among others.