Merge pull request #1707 from dunst0/fix/ims_diameter_server