Feature/zen 10107 3