cherrypick commit https://gitlab.sas.com/jadean/metis/commit/dc6dc2401b288077ae7e3709b58c0124fdd98e3d
cherrypick commit https://gitlab.sas.com/jadean/metis/commit/dc6dc2401b288077ae7e3709b58c0124fdd98e3d
jld23/saspy,jld23/saspy