Feature/zen 11926