Merge "Store Connection in InputTarget and Monitor" into main