This patch requires my salstatck/salt pull request [#25165](https://github.com/saltstack/salt/pull/25165). Signed-off-by: René Jochum <rene@jochums.at>