Release 1.6.86

Added 6334
Added 6331
Added 6328