Merge summer changes with main repository.