Sync stagecontrol.
Fix duplicate import.
Merge branch 'master' into storm2
Fix duplicate import.
Update storm2 miscControl to modules approach.
Merge branch 'master' into storm2