Feature/zen 14462.b