partial dump (more granular commits to follow)