Feature/zen 13378a