Feature/zen 11709