New branch for ef6 version of project.