ZEN-15370: Gateway type property is not Entity
ZEN-15369: Fixed TypeError when remodeling instances during monitoring
Merge pull request #33 from ssirushchyshyn/develop

ZEN-15369,  ZEN-15370
Merge remote branch 'upstream/develop' into develop