Merge "Only tag/untag sockets when open." into ics-mr1