Clear up honors
Merge branch 'stage'