Merge expose-stage-data.cpp into expose-stage.cpp

Merge expose-stage-data.cpp into expose-stage.cpp #157