merge updates from master64