Yes, that was Melanchthon , I believe (the diversity / unity / charity bit).
However, even when it comes to salvation you have plenty of shouting and an absolute mess: Protestants, Catholics, Calvinists, Arminians, Legalists, Charismatics Gnostics, Adventists, Wesleyans, Southern Baptists...