Addressing issues/concerns in #11611

Addressing issues/concerns in #11611
This is a redeploy of https://github.com/saltstack/salt/pull/12407