Hi Christoph, thank you for the pull request. Could you please create one commit for each affected module, that it can be applied individually? Have a look to our documentation: https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md