Update main branch to 1.6.4