Feature/zen 12681