Feature/zen 12826