Release 1.6.30

Added 5995
Updated 5958
Updated 5693