Feature/zen 10516