Merge "Minor OrderedStreamingForkController improvements"