Merge "Connection attachment template issue fix"