Feature/zen 12616