Use ellipsis symbol to keep lint happy
Merge branch 'release' into upstream