Feature/zen 12145