fix instance state monitoring
fix bugs
Merge pull request #69 from ssbunyk/develop

Fix ZEN-10187