Applied to the api refactor 0.9, added test with mondix runtime
Remove commented out code
Merge branch 'master' into api-refactor0.9
Remove commented out code