https://github.com/saltstack/salt/pull/9611