Feature/zen 10685