Merge "Separate the notion of "stop" from that of "release", i.e."