Feature/zen 14688 2