Merge "Correct mmsproxies extra zeros in Greece and Austria" into main