Release 1.6.20

Added 5958
Added 1931
Added 5957