Quasi-static spherical/cylindrical cavity expansion in a medium with an arbitrary equation of state and a shear strength plasticity envelope. (15th May 2020)