Feature/zen 12424