Manual merge, added baked-in default and validation-- Closes custom onConnect logic part of #756