untested 1.6.4 support
rebase and apply 1.6.4
merge
1.6.2