Feature/zen 14434

Fixes ZEN-14434