Update Stage class to disable.
Merge branch 'dev' into gh-pages