merging unresolver_entry branch to next