Enable and disable status implementation
Enable and disable examples
Merge branch 'refs/heads/master' into dev