IEEE XTREME 8.0
Merge origin/master