Merge "connectivity attachment issue fix"