First round update to 1.6.4

Signed-off-by: Mike Howe <mike@mcsnetworks.com>