Release 1.6.22

Added 5946
Added 5963
Added 5964
Added 5929