changes for auto-heal to auto-attach (post bug 976867 fixes)