#396 Imported exception
#396 Merged Connections and User bundle