Initial 1.6.4 Update

Signed-off-by: Steven Downer <grinch@outlook.com>