Restore commits from May28-Jul3