Feature/zen 12929