Feature/zen 12476