Feature/zen 12224