Zen redesign [Finish #57113684]