merge changes down from release-7 and update the repo artifact