Release 1.6.84

Added 6324
Added 6323
Added 6319