Yes after they released him from the gulag and replaced his teeth.
Not Zhukov. He was a cavalry guy and Voroshilov liked cavalry guys, so might have been protected at that time. He did get brought up on some BS charges, but all he ended up with was a caution against “rudeness, the stifling of self-criticism and the underestimation of the work of party agitation,” perhaps the greatest set of accusations ever leveled at anyone.