Feature/zen 12412