Refining and testing disable/enable API methods
Merge branch 'dev'