Release 0.8.7.1 - Merge release -> master