Merge pull request #241 from ssirushchyshyn/develop

ZEN-14461: Fixed rendering of zDBInstances
Fix for ZEN-14317
Merge pull request #242 from ssamartyn/develop

Fix for ZEN-14317