Feature/zen 12826

Done