summary update
Merging with upstream