Thorsten, i also found out there are some more places upstream besides returners and modules that didnt have the drop in replacement mechanism yet. e.g. salt/pillar/mysql.py or salt/auth/mysql.py i updated the patch in https://build.opensuse.org/package/show/home:m_meister:branches:systemsmanagement:saltstack/salt