Feature/zen 14708 2