Feature/zen 10832