Release 1.6.37

Updated 4416
Added 6040
Updated 1178