Feature/zen 12429