@@ -3945,11 +3945,12 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *testing.T) {

 	assert.Assert(c, err != nil, "Command should have failed but succeeded with: %s\nContainer 'test' [%+v]: %s\nContainer 'fail' [%+v]: %s", out, err1, out1, err2, out2)

 	// check for windows error as well

 	// TODO Windows Post TP5. Fix the error message string

-	assert.Assert(c, strings.Contains(out, "port is already allocated") ||

-		strings.Contains(out, "were not connected because a duplicate name exists") ||

-		strings.Contains(out, "The specified port already exists") ||

-		strings.Contains(out, "HNS failed with error : Failed to create endpoint") ||

-		strings.Contains(out, "HNS failed with error : The object already exists"), fmt.Sprintf("Output: %s", out))

+	outLowerCase := strings.ToLower(out)

+	assert.Assert(c, strings.Contains(outLowerCase, "port is already allocated") ||

+		strings.Contains(outLowerCase, "were not connected because a duplicate name exists") ||

+		strings.Contains(outLowerCase, "the specified port already exists") ||

+		strings.Contains(outLowerCase, "hns failed with error : failed to create endpoint") ||

+		strings.Contains(outLowerCase, "hns failed with error : the object already exists"), fmt.Sprintf("Output: %s", out))

 	dockerCmd(c, "rm", "-f", "test")

 	// NGoroutines is not updated right away, so we need to wait before failing

@@ -1,5 +1,5 @@

 github.com/Azure/go-ansiterm                        d6e3b3328b783f23731bc4d058875b0371ff8109

-github.com/Microsoft/hcsshim                        2226e083fc390003ae5aa8325c3c92789afa0e7a

+github.com/Microsoft/hcsshim                        b3f49c06ffaeef24d09c6c08ec8ec8425a0303e2

 github.com/Microsoft/go-winio                       6c72808b55902eae4c5943626030429ff20f3b63 # v0.4.14

 github.com/docker/libtrust                          9cbd2a1374f46905c68a4eb3694a130610adc62a

 github.com/golang/gddo                              72a348e765d293ed6d1ded7b699591f14d6cd921

@@ -1,33 +1,19 @@

 // Code generated by protoc-gen-gogo. DO NOT EDIT.

 // source: github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto

-/*

-	Package options is a generated protocol buffer package.

-

-	It is generated from these files:

-		github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto

-

-	It has these top-level messages:

-		Options

-		ProcessDetails

-*/

 package options

-import proto "github.com/gogo/protobuf/proto"

-import fmt "fmt"

-import math "math"

-

-// skipping weak import gogoproto "github.com/gogo/protobuf/gogoproto"

-import _ "github.com/gogo/protobuf/types"

-

-import time "time"

-

-import types "github.com/gogo/protobuf/types"

-

-import strings "strings"

-import reflect "reflect"

-

-import io "io"

+import (

+	fmt "fmt"

+	proto "github.com/gogo/protobuf/proto"

+	_ "github.com/gogo/protobuf/types"

+	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"

+	io "io"

+	math "math"

+	reflect "reflect"

+	strings "strings"

+	time "time"

+)

 // Reference imports to suppress errors if they are not otherwise used.

 var _ = proto.Marshal

@@ -54,6 +40,7 @@ var Options_DebugType_name = map[int32]string{

 	1: "FILE",

 	2: "ETW",

 }

+

 var Options_DebugType_value = map[string]int32{

 	"NPIPE": 0,

 	"FILE":  1,

@@ -63,7 +50,10 @@ var Options_DebugType_value = map[string]int32{

 func (x Options_DebugType) String() string {

 	return proto.EnumName(Options_DebugType_name, int32(x))

 }

-func (Options_DebugType) EnumDescriptor() ([]byte, []int) { return fileDescriptorRunhcs, []int{0, 0} }

+

+func (Options_DebugType) EnumDescriptor() ([]byte, []int) {

+	return fileDescriptor_b643df6839c75082, []int{0, 0}

+}

 type Options_SandboxIsolation int32

@@ -76,6 +66,7 @@ var Options_SandboxIsolation_name = map[int32]string{

 	0: "PROCESS",

 	1: "HYPERVISOR",

 }

+

 var Options_SandboxIsolation_value = map[string]int32{

 	"PROCESS":    0,

 	"HYPERVISOR": 1,

@@ -84,8 +75,9 @@ var Options_SandboxIsolation_value = map[string]int32{

 func (x Options_SandboxIsolation) String() string {

 	return proto.EnumName(Options_SandboxIsolation_name, int32(x))

 }

+

 func (Options_SandboxIsolation) EnumDescriptor() ([]byte, []int) {

-	return fileDescriptorRunhcs, []int{0, 1}

+	return fileDescriptor_b643df6839c75082, []int{0, 1}

 }

 // Options are the set of customizations that can be passed at Create time.

@@ -109,18 +101,49 @@ type Options struct {

 	SandboxIsolation Options_SandboxIsolation `protobuf:"varint,6,opt,name=sandbox_isolation,json=sandboxIsolation,proto3,enum=containerd.runhcs.v1.Options_SandboxIsolation" json:"sandbox_isolation,omitempty"`

 	// boot_files_root_path is the path to the directory containing the LCOW

 	// kernel and root FS files.

-	BootFilesRootPath string `protobuf:"bytes,7,opt,name=boot_files_root_path,json=bootFilesRootPath,proto3" json:"boot_files_root_path,omitempty"`

+	BootFilesRootPath    string   `protobuf:"bytes,7,opt,name=boot_files_root_path,json=bootFilesRootPath,proto3" json:"boot_files_root_path,omitempty"`

+	XXX_NoUnkeyedLiteral struct{} `json:"-"`

+	XXX_unrecognized     []byte   `json:"-"`

+	XXX_sizecache        int32    `json:"-"`

+}

+

+func (m *Options) Reset()      { *m = Options{} }

+func (*Options) ProtoMessage() {}

+func (*Options) Descriptor() ([]byte, []int) {

+	return fileDescriptor_b643df6839c75082, []int{0}

+}

+func (m *Options) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *Options) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_Options.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *Options) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_Options.Merge(m, src)

+}

+func (m *Options) XXX_Size() int {

+	return m.Size()

+}

+func (m *Options) XXX_DiscardUnknown() {

+	xxx_messageInfo_Options.DiscardUnknown(m)

 }

-func (m *Options) Reset()                    { *m = Options{} }

-func (*Options) ProtoMessage()               {}

-func (*Options) Descriptor() ([]byte, []int) { return fileDescriptorRunhcs, []int{0} }

+var xxx_messageInfo_Options proto.InternalMessageInfo

 // ProcessDetails contains additional information about a process. This is the additional

 // info returned in the Pids query.

 type ProcessDetails struct {

 	ImageName                    string    `protobuf:"bytes,1,opt,name=image_name,json=imageName,proto3" json:"image_name,omitempty"`

-	CreatedAt                    time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,stdtime" json:"created_at"`

+	CreatedAt                    time.Time `protobuf:"bytes,2,opt,name=created_at,json=createdAt,proto3,stdtime" json:"created_at"`

 	KernelTime_100Ns             uint64    `protobuf:"varint,3,opt,name=kernel_time_100_ns,json=kernelTime100Ns,proto3" json:"kernel_time_100_ns,omitempty"`

 	MemoryCommitBytes            uint64    `protobuf:"varint,4,opt,name=memory_commit_bytes,json=memoryCommitBytes,proto3" json:"memory_commit_bytes,omitempty"`

 	MemoryWorkingSetPrivateBytes uint64    `protobuf:"varint,5,opt,name=memory_working_set_private_bytes,json=memoryWorkingSetPrivateBytes,proto3" json:"memory_working_set_private_bytes,omitempty"`

@@ -128,18 +151,102 @@ type ProcessDetails struct {

 	ProcessID                    uint32    `protobuf:"varint,7,opt,name=process_id,json=processId,proto3" json:"process_id,omitempty"`

 	UserTime_100Ns               uint64    `protobuf:"varint,8,opt,name=user_time_100_ns,json=userTime100Ns,proto3" json:"user_time_100_ns,omitempty"`

 	ExecID                       string    `protobuf:"bytes,9,opt,name=exec_id,json=execId,proto3" json:"exec_id,omitempty"`

+	XXX_NoUnkeyedLiteral         struct{}  `json:"-"`

+	XXX_unrecognized             []byte    `json:"-"`

+	XXX_sizecache                int32     `json:"-"`

 }

-func (m *ProcessDetails) Reset()                    { *m = ProcessDetails{} }

-func (*ProcessDetails) ProtoMessage()               {}

-func (*ProcessDetails) Descriptor() ([]byte, []int) { return fileDescriptorRunhcs, []int{1} }

+func (m *ProcessDetails) Reset()      { *m = ProcessDetails{} }

+func (*ProcessDetails) ProtoMessage() {}

+func (*ProcessDetails) Descriptor() ([]byte, []int) {

+	return fileDescriptor_b643df6839c75082, []int{1}

+}

+func (m *ProcessDetails) XXX_Unmarshal(b []byte) error {

+	return m.Unmarshal(b)

+}

+func (m *ProcessDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {

+	if deterministic {

+		return xxx_messageInfo_ProcessDetails.Marshal(b, m, deterministic)

+	} else {

+		b = b[:cap(b)]

+		n, err := m.MarshalTo(b)

+		if err != nil {

+			return nil, err

+		}

+		return b[:n], nil

+	}

+}

+func (m *ProcessDetails) XXX_Merge(src proto.Message) {

+	xxx_messageInfo_ProcessDetails.Merge(m, src)

+}

+func (m *ProcessDetails) XXX_Size() int {

+	return m.Size()

+}

+func (m *ProcessDetails) XXX_DiscardUnknown() {

+	xxx_messageInfo_ProcessDetails.DiscardUnknown(m)

+}

+

+var xxx_messageInfo_ProcessDetails proto.InternalMessageInfo

 func init() {

-	proto.RegisterType((*Options)(nil), "containerd.runhcs.v1.Options")

-	proto.RegisterType((*ProcessDetails)(nil), "containerd.runhcs.v1.ProcessDetails")

 	proto.RegisterEnum("containerd.runhcs.v1.Options_DebugType", Options_DebugType_name, Options_DebugType_value)

 	proto.RegisterEnum("containerd.runhcs.v1.Options_SandboxIsolation", Options_SandboxIsolation_name, Options_SandboxIsolation_value)

+	proto.RegisterType((*Options)(nil), "containerd.runhcs.v1.Options")

+	proto.RegisterType((*ProcessDetails)(nil), "containerd.runhcs.v1.ProcessDetails")

+}

+

+func init() {

+	proto.RegisterFile("github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto", fileDescriptor_b643df6839c75082)

 }

+

+var fileDescriptor_b643df6839c75082 = []byte{

+	// 704 bytes of a gzipped FileDescriptorProto

+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xda, 0x48,

+	0x18, 0xc6, 0xe1, 0xd3, 0x6f, 0x96, 0xc4, 0x99, 0xe5, 0x80, 0xb2, 0xbb, 0x80, 0xc8, 0x21, 0x89,

+	0x76, 0x63, 0x43, 0xf6, 0xd8, 0x53, 0x09, 0xa0, 0xba, 0x6a, 0x83, 0x65, 0xa2, 0xa6, 0x1f, 0x07,

+	0xcb, 0xd8, 0x83, 0xb1, 0x82, 0x3d, 0xd6, 0xcc, 0x90, 0x86, 0x5b, 0x7f, 0x42, 0x7f, 0x55, 0x95,

+	0x63, 0x8f, 0x95, 0x2a, 0xa5, 0x0d, 0xbf, 0xa4, 0x9a, 0xb1, 0x49, 0xd4, 0x28, 0xea, 0xa5, 0x27,

+	0xc6, 0xcf, 0xf3, 0xbc, 0xcf, 0xfb, 0x29, 0x60, 0x14, 0x84, 0x7c, 0xb6, 0x98, 0xe8, 0x1e, 0x89,

+	0x8c, 0x97, 0xa1, 0x47, 0x09, 0x23, 0x53, 0x6e, 0xcc, 0x3c, 0xc6, 0x66, 0x61, 0x64, 0x78, 0x91,

+	0x6f, 0x78, 0x24, 0xe6, 0x6e, 0x18, 0x63, 0xea, 0x1f, 0x09, 0xec, 0x88, 0x2e, 0xe2, 0x99, 0xc7,

+	0x8e, 0x2e, 0xbb, 0x06, 0x49, 0x78, 0x48, 0x62, 0x66, 0xa4, 0x88, 0x9e, 0x50, 0xc2, 0x09, 0xaa,

+	0xdd, 0xeb, 0xf5, 0x8c, 0xb8, 0xec, 0xee, 0xd6, 0x02, 0x12, 0x10, 0x29, 0x30, 0xc4, 0x2b, 0xd5,

+	0xee, 0x36, 0x03, 0x42, 0x82, 0x39, 0x36, 0xe4, 0xd7, 0x64, 0x31, 0x35, 0x78, 0x18, 0x61, 0xc6,

+	0xdd, 0x28, 0x49, 0x05, 0xed, 0x4f, 0x79, 0x28, 0x8f, 0xd2, 0x2c, 0xa8, 0x06, 0x45, 0x1f, 0x4f,

+	0x16, 0x41, 0x5d, 0x69, 0x29, 0x07, 0x15, 0x3b, 0xfd, 0x40, 0x43, 0x00, 0xf9, 0x70, 0xf8, 0x32,

+	0xc1, 0xf5, 0x8d, 0x96, 0x72, 0xb0, 0x75, 0xbc, 0xaf, 0x3f, 0x56, 0x83, 0x9e, 0x19, 0xe9, 0x7d,

+	0xa1, 0x3f, 0x5b, 0x26, 0xd8, 0x56, 0xfd, 0xf5, 0x13, 0xed, 0x41, 0x95, 0xe2, 0x20, 0x64, 0x9c,

+	0x2e, 0x1d, 0x4a, 0x08, 0xaf, 0xe7, 0x5b, 0xca, 0x81, 0x6a, 0xff, 0xb1, 0x06, 0x6d, 0x42, 0xb8,

+	0x10, 0x31, 0x37, 0xf6, 0x27, 0xe4, 0xca, 0x09, 0x23, 0x37, 0xc0, 0xf5, 0x42, 0x2a, 0xca, 0x40,

+	0x53, 0x60, 0xe8, 0x10, 0xb4, 0xb5, 0x28, 0x99, 0xbb, 0x7c, 0x4a, 0x68, 0x54, 0x2f, 0x4a, 0xdd,

+	0x76, 0x86, 0x5b, 0x19, 0x8c, 0xde, 0xc1, 0xce, 0x9d, 0x1f, 0x23, 0x73, 0x57, 0xd4, 0x57, 0x2f,

+	0xc9, 0x1e, 0xf4, 0x5f, 0xf7, 0x30, 0xce, 0x32, 0xae, 0xa3, 0xec, 0x75, 0xce, 0x3b, 0x04, 0x19,

+	0x50, 0x9b, 0x10, 0xc2, 0x9d, 0x69, 0x38, 0xc7, 0x4c, 0xf6, 0xe4, 0x24, 0x2e, 0x9f, 0xd5, 0xcb,

+	0xb2, 0x96, 0x1d, 0xc1, 0x0d, 0x05, 0x25, 0x3a, 0xb3, 0x5c, 0x3e, 0x6b, 0x1f, 0x82, 0x7a, 0x37,

+	0x1a, 0xa4, 0x42, 0xf1, 0xd4, 0x32, 0xad, 0x81, 0x96, 0x43, 0x15, 0x28, 0x0c, 0xcd, 0x17, 0x03,

+	0x4d, 0x41, 0x65, 0xc8, 0x0f, 0xce, 0xce, 0xb5, 0x8d, 0xb6, 0x01, 0xda, 0xc3, 0x0a, 0xd0, 0x26,

+	0x94, 0x2d, 0x7b, 0x74, 0x32, 0x18, 0x8f, 0xb5, 0x1c, 0xda, 0x02, 0x78, 0xf6, 0xc6, 0x1a, 0xd8,

+	0xaf, 0xcc, 0xf1, 0xc8, 0xd6, 0x94, 0xf6, 0xd7, 0x3c, 0x6c, 0x59, 0x94, 0x78, 0x98, 0xb1, 0x3e,

+	0xe6, 0x6e, 0x38, 0x67, 0xe8, 0x1f, 0x00, 0x39, 0x44, 0x27, 0x76, 0x23, 0x2c, 0x97, 0xaa, 0xda,

+	0xaa, 0x44, 0x4e, 0xdd, 0x08, 0xa3, 0x13, 0x00, 0x8f, 0x62, 0x97, 0x63, 0xdf, 0x71, 0xb9, 0x5c,

+	0xec, 0xe6, 0xf1, 0xae, 0x9e, 0x1e, 0x8c, 0xbe, 0x3e, 0x18, 0xfd, 0x6c, 0x7d, 0x30, 0xbd, 0xca,

+	0xf5, 0x4d, 0x33, 0xf7, 0xf1, 0x5b, 0x53, 0xb1, 0xd5, 0x2c, 0xee, 0x29, 0x47, 0xff, 0x02, 0xba,

+	0xc0, 0x34, 0xc6, 0x73, 0x47, 0x5c, 0x96, 0xd3, 0xed, 0x74, 0x9c, 0x98, 0xc9, 0xd5, 0x16, 0xec,

+	0xed, 0x94, 0x11, 0x0e, 0xdd, 0x4e, 0xe7, 0x94, 0x21, 0x1d, 0xfe, 0x8c, 0x70, 0x44, 0xe8, 0xd2,

+	0xf1, 0x48, 0x14, 0x85, 0xdc, 0x99, 0x2c, 0x39, 0x66, 0x72, 0xc7, 0x05, 0x7b, 0x27, 0xa5, 0x4e,

+	0x24, 0xd3, 0x13, 0x04, 0x1a, 0x42, 0x2b, 0xd3, 0xbf, 0x27, 0xf4, 0x22, 0x8c, 0x03, 0x87, 0x61,

+	0xee, 0x24, 0x34, 0xbc, 0x74, 0x39, 0xce, 0x82, 0x8b, 0x32, 0xf8, 0xef, 0x54, 0x77, 0x9e, 0xca,

+	0xc6, 0x98, 0x5b, 0xa9, 0x28, 0xf5, 0xe9, 0x43, 0xf3, 0x11, 0x1f, 0x36, 0x73, 0x29, 0xf6, 0x33,

+	0x9b, 0x92, 0xb4, 0xf9, 0xeb, 0xa1, 0xcd, 0x58, 0x6a, 0x52, 0x97, 0xff, 0x00, 0x92, 0x74, 0xc0,

+	0x4e, 0xe8, 0xcb, 0x25, 0x57, 0x7b, 0xd5, 0xd5, 0x4d, 0x53, 0xcd, 0xc6, 0x6e, 0xf6, 0x6d, 0x35,

+	0x13, 0x98, 0x3e, 0xda, 0x07, 0x6d, 0xc1, 0x30, 0xfd, 0x69, 0x2c, 0x15, 0x99, 0xa4, 0x2a, 0xf0,

+	0xfb, 0xa1, 0xec, 0x41, 0x19, 0x5f, 0x61, 0x4f, 0x78, 0xaa, 0x62, 0x45, 0x3d, 0x58, 0xdd, 0x34,

+	0x4b, 0x83, 0x2b, 0xec, 0x99, 0x7d, 0xbb, 0x24, 0x28, 0xd3, 0xef, 0xf9, 0xd7, 0xb7, 0x8d, 0xdc,

+	0x97, 0xdb, 0x46, 0xee, 0xc3, 0xaa, 0xa1, 0x5c, 0xaf, 0x1a, 0xca, 0xe7, 0x55, 0x43, 0xf9, 0xbe,

+	0x6a, 0x28, 0x6f, 0x9f, 0xff, 0xfe, 0xdf, 0xcb, 0x93, 0xec, 0xf7, 0x75, 0x6e, 0x52, 0x92, 0x7b,

+	0xff, 0xff, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x9a, 0x54, 0x17, 0xb5, 0x04, 0x00, 0x00,

+}

+

 func (m *Options) Marshal() (dAtA []byte, err error) {

 	size := m.Size()

 	dAtA = make([]byte, size)

@@ -199,6 +306,9 @@ func (m *Options) MarshalTo(dAtA []byte) (int, error) {

 		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath)))

 		i += copy(dAtA[i:], m.BootFilesRootPath)

 	}

+	if m.XXX_unrecognized != nil {

+		i += copy(dAtA[i:], m.XXX_unrecognized)

+	}

 	return i, nil

 }

@@ -225,8 +335,8 @@ func (m *ProcessDetails) MarshalTo(dAtA []byte) (int, error) {

 	}

 	dAtA[i] = 0x12

 	i++

-	i = encodeVarintRunhcs(dAtA, i, uint64(types.SizeOfStdTime(m.CreatedAt)))

-	n1, err := types.StdTimeMarshalTo(m.CreatedAt, dAtA[i:])

+	i = encodeVarintRunhcs(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)))

+	n1, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i:])

 	if err != nil {

 		return 0, err

 	}

@@ -267,6 +377,9 @@ func (m *ProcessDetails) MarshalTo(dAtA []byte) (int, error) {

 		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID)))

 		i += copy(dAtA[i:], m.ExecID)

 	}

+	if m.XXX_unrecognized != nil {

+		i += copy(dAtA[i:], m.XXX_unrecognized)

+	}

 	return i, nil

 }

@@ -280,6 +393,9 @@ func encodeVarintRunhcs(dAtA []byte, offset int, v uint64) int {

 	return offset + 1

 }

 func (m *Options) Size() (n int) {

+	if m == nil {

+		return 0

+	}

 	var l int

 	_ = l

 	if m.Debug {

@@ -307,17 +423,23 @@ func (m *Options) Size() (n int) {

 	if l > 0 {

 		n += 1 + l + sovRunhcs(uint64(l))

 	}

+	if m.XXX_unrecognized != nil {

+		n += len(m.XXX_unrecognized)

+	}

 	return n

 }

 func (m *ProcessDetails) Size() (n int) {

+	if m == nil {

+		return 0

+	}

 	var l int

 	_ = l

 	l = len(m.ImageName)

 	if l > 0 {

 		n += 1 + l + sovRunhcs(uint64(l))

 	}

-	l = types.SizeOfStdTime(m.CreatedAt)

+	l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)

 	n += 1 + l + sovRunhcs(uint64(l))

 	if m.KernelTime_100Ns != 0 {

 		n += 1 + sovRunhcs(uint64(m.KernelTime_100Ns))

@@ -341,6 +463,9 @@ func (m *ProcessDetails) Size() (n int) {

 	if l > 0 {

 		n += 1 + l + sovRunhcs(uint64(l))

 	}

+	if m.XXX_unrecognized != nil {

+		n += len(m.XXX_unrecognized)

+	}

 	return n

 }

@@ -369,6 +494,7 @@ func (this *Options) String() string {

 		`SandboxPlatform:` + fmt.Sprintf("%v", this.SandboxPlatform) + `,`,

 		`SandboxIsolation:` + fmt.Sprintf("%v", this.SandboxIsolation) + `,`,

 		`BootFilesRootPath:` + fmt.Sprintf("%v", this.BootFilesRootPath) + `,`,

+		`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,

 		`}`,

 	}, "")

 	return s

@@ -379,7 +505,7 @@ func (this *ProcessDetails) String() string {

 	}

 	s := strings.Join([]string{`&ProcessDetails{`,

 		`ImageName:` + fmt.Sprintf("%v", this.ImageName) + `,`,

-		`CreatedAt:` + strings.Replace(strings.Replace(this.CreatedAt.String(), "Timestamp", "google_protobuf1.Timestamp", 1), `&`, ``, 1) + `,`,

+		`CreatedAt:` + strings.Replace(strings.Replace(this.CreatedAt.String(), "Timestamp", "types.Timestamp", 1), `&`, ``, 1) + `,`,

 		`KernelTime_100Ns:` + fmt.Sprintf("%v", this.KernelTime_100Ns) + `,`,

 		`MemoryCommitBytes:` + fmt.Sprintf("%v", this.MemoryCommitBytes) + `,`,

 		`MemoryWorkingSetPrivateBytes:` + fmt.Sprintf("%v", this.MemoryWorkingSetPrivateBytes) + `,`,

@@ -387,6 +513,7 @@ func (this *ProcessDetails) String() string {

 		`ProcessID:` + fmt.Sprintf("%v", this.ProcessID) + `,`,

 		`UserTime_100Ns:` + fmt.Sprintf("%v", this.UserTime_100Ns) + `,`,

 		`ExecID:` + fmt.Sprintf("%v", this.ExecID) + `,`,

+		`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,

 		`}`,

 	}, "")

 	return s

@@ -414,7 +541,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 			}

 			b := dAtA[iNdEx]

 			iNdEx++

-			wire |= (uint64(b) & 0x7F) << shift

+			wire |= uint64(b&0x7F) << shift

 			if b < 0x80 {

 				break

 			}

@@ -442,7 +569,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				v |= (int(b) & 0x7F) << shift

+				v |= int(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -462,7 +589,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.DebugType |= (Options_DebugType(b) & 0x7F) << shift

+				m.DebugType |= Options_DebugType(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -481,7 +608,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				stringLen |= (uint64(b) & 0x7F) << shift

+				stringLen |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -491,6 +618,9 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				return ErrInvalidLengthRunhcs

 			}

 			postIndex := iNdEx + intStringLen

+			if postIndex < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if postIndex > l {

 				return io.ErrUnexpectedEOF

 			}

@@ -510,7 +640,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				stringLen |= (uint64(b) & 0x7F) << shift

+				stringLen |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -520,6 +650,9 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				return ErrInvalidLengthRunhcs

 			}

 			postIndex := iNdEx + intStringLen

+			if postIndex < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if postIndex > l {

 				return io.ErrUnexpectedEOF

 			}

@@ -539,7 +672,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				stringLen |= (uint64(b) & 0x7F) << shift

+				stringLen |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -549,6 +682,9 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				return ErrInvalidLengthRunhcs

 			}

 			postIndex := iNdEx + intStringLen

+			if postIndex < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if postIndex > l {

 				return io.ErrUnexpectedEOF

 			}

@@ -568,7 +704,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.SandboxIsolation |= (Options_SandboxIsolation(b) & 0x7F) << shift

+				m.SandboxIsolation |= Options_SandboxIsolation(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -587,7 +723,7 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				stringLen |= (uint64(b) & 0x7F) << shift

+				stringLen |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -597,6 +733,9 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 				return ErrInvalidLengthRunhcs

 			}

 			postIndex := iNdEx + intStringLen

+			if postIndex < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if postIndex > l {

 				return io.ErrUnexpectedEOF

 			}

@@ -611,9 +750,13 @@ func (m *Options) Unmarshal(dAtA []byte) error {

 			if skippy < 0 {

 				return ErrInvalidLengthRunhcs

 			}

+			if (iNdEx + skippy) < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if (iNdEx + skippy) > l {

 				return io.ErrUnexpectedEOF

 			}

+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)

 			iNdEx += skippy

 		}

 	}

@@ -638,7 +781,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 			}

 			b := dAtA[iNdEx]

 			iNdEx++

-			wire |= (uint64(b) & 0x7F) << shift

+			wire |= uint64(b&0x7F) << shift

 			if b < 0x80 {

 				break

 			}

@@ -666,7 +809,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				stringLen |= (uint64(b) & 0x7F) << shift

+				stringLen |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -676,6 +819,9 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				return ErrInvalidLengthRunhcs

 			}

 			postIndex := iNdEx + intStringLen

+			if postIndex < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if postIndex > l {

 				return io.ErrUnexpectedEOF

 			}

@@ -695,7 +841,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				msglen |= (int(b) & 0x7F) << shift

+				msglen |= int(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -704,10 +850,13 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				return ErrInvalidLengthRunhcs

 			}

 			postIndex := iNdEx + msglen

+			if postIndex < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if postIndex > l {

 				return io.ErrUnexpectedEOF

 			}

-			if err := types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {

+			if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {

 				return err

 			}

 			iNdEx = postIndex

@@ -725,7 +874,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.KernelTime_100Ns |= (uint64(b) & 0x7F) << shift

+				m.KernelTime_100Ns |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -744,7 +893,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.MemoryCommitBytes |= (uint64(b) & 0x7F) << shift

+				m.MemoryCommitBytes |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -763,7 +912,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.MemoryWorkingSetPrivateBytes |= (uint64(b) & 0x7F) << shift

+				m.MemoryWorkingSetPrivateBytes |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -782,7 +931,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.MemoryWorkingSetSharedBytes |= (uint64(b) & 0x7F) << shift

+				m.MemoryWorkingSetSharedBytes |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -801,7 +950,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.ProcessID |= (uint32(b) & 0x7F) << shift

+				m.ProcessID |= uint32(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -820,7 +969,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				m.UserTime_100Ns |= (uint64(b) & 0x7F) << shift

+				m.UserTime_100Ns |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -839,7 +988,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				}

 				b := dAtA[iNdEx]

 				iNdEx++

-				stringLen |= (uint64(b) & 0x7F) << shift

+				stringLen |= uint64(b&0x7F) << shift

 				if b < 0x80 {

 					break

 				}

@@ -849,6 +998,9 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 				return ErrInvalidLengthRunhcs

 			}

 			postIndex := iNdEx + intStringLen

+			if postIndex < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if postIndex > l {

 				return io.ErrUnexpectedEOF

 			}

@@ -863,9 +1015,13 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {

 			if skippy < 0 {

 				return ErrInvalidLengthRunhcs

 			}

+			if (iNdEx + skippy) < 0 {

+				return ErrInvalidLengthRunhcs

+			}

 			if (iNdEx + skippy) > l {

 				return io.ErrUnexpectedEOF

 			}

+			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)

 			iNdEx += skippy

 		}

 	}

@@ -929,10 +1085,13 @@ func skipRunhcs(dAtA []byte) (n int, err error) {

 					break

 				}

 			}

-			iNdEx += length

 			if length < 0 {

 				return 0, ErrInvalidLengthRunhcs

 			}

+			iNdEx += length

+			if iNdEx < 0 {

+				return 0, ErrInvalidLengthRunhcs

+			}

 			return iNdEx, nil

 		case 3:

 			for {

@@ -961,6 +1120,9 @@ func skipRunhcs(dAtA []byte) (n int, err error) {

 					return 0, err

 				}

 				iNdEx = start + next

+				if iNdEx < 0 {

+					return 0, ErrInvalidLengthRunhcs

+				}

 			}

 			return iNdEx, nil

 		case 4:

@@ -979,55 +1141,3 @@ var (

 	ErrInvalidLengthRunhcs = fmt.Errorf("proto: negative length found during unmarshaling")

 	ErrIntOverflowRunhcs   = fmt.Errorf("proto: integer overflow")

 )

-

-func init() {

-	proto.RegisterFile("github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto", fileDescriptorRunhcs)

-}

-

-var fileDescriptorRunhcs = []byte{

-	// 704 bytes of a gzipped FileDescriptorProto

-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xda, 0x48,

-	0x18, 0xc6, 0xe1, 0xd3, 0x6f, 0x96, 0xc4, 0x99, 0xe5, 0x80, 0xb2, 0xbb, 0x80, 0xc8, 0x21, 0x89,

-	0x76, 0x63, 0x43, 0xf6, 0xd8, 0x53, 0x09, 0xa0, 0xba, 0x6a, 0x83, 0x65, 0xa2, 0xa6, 0x1f, 0x07,

-	0xcb, 0xd8, 0x83, 0xb1, 0x82, 0x3d, 0xd6, 0xcc, 0x90, 0x86, 0x5b, 0x7f, 0x42, 0x7f, 0x55, 0x95,

-	0x63, 0x8f, 0x95, 0x2a, 0xa5, 0x0d, 0xbf, 0xa4, 0x9a, 0xb1, 0x49, 0xd4, 0x28, 0xea, 0xa5, 0x27,

-	0xc6, 0xcf, 0xf3, 0xbc, 0xcf, 0xfb, 0x29, 0x60, 0x14, 0x84, 0x7c, 0xb6, 0x98, 0xe8, 0x1e, 0x89,

-	0x8c, 0x97, 0xa1, 0x47, 0x09, 0x23, 0x53, 0x6e, 0xcc, 0x3c, 0xc6, 0x66, 0x61, 0x64, 0x78, 0x91,

-	0x6f, 0x78, 0x24, 0xe6, 0x6e, 0x18, 0x63, 0xea, 0x1f, 0x09, 0xec, 0x88, 0x2e, 0xe2, 0x99, 0xc7,

-	0x8e, 0x2e, 0xbb, 0x06, 0x49, 0x78, 0x48, 0x62, 0x66, 0xa4, 0x88, 0x9e, 0x50, 0xc2, 0x09, 0xaa,

-	0xdd, 0xeb, 0xf5, 0x8c, 0xb8, 0xec, 0xee, 0xd6, 0x02, 0x12, 0x10, 0x29, 0x30, 0xc4, 0x2b, 0xd5,

-	0xee, 0x36, 0x03, 0x42, 0x82, 0x39, 0x36, 0xe4, 0xd7, 0x64, 0x31, 0x35, 0x78, 0x18, 0x61, 0xc6,

-	0xdd, 0x28, 0x49, 0x05, 0xed, 0x4f, 0x79, 0x28, 0x8f, 0xd2, 0x2c, 0xa8, 0x06, 0x45, 0x1f, 0x4f,

-	0x16, 0x41, 0x5d, 0x69, 0x29, 0x07, 0x15, 0x3b, 0xfd, 0x40, 0x43, 0x00, 0xf9, 0x70, 0xf8, 0x32,

-	0xc1, 0xf5, 0x8d, 0x96, 0x72, 0xb0, 0x75, 0xbc, 0xaf, 0x3f, 0x56, 0x83, 0x9e, 0x19, 0xe9, 0x7d,

-	0xa1, 0x3f, 0x5b, 0x26, 0xd8, 0x56, 0xfd, 0xf5, 0x13, 0xed, 0x41, 0x95, 0xe2, 0x20, 0x64, 0x9c,

-	0x2e, 0x1d, 0x4a, 0x08, 0xaf, 0xe7, 0x5b, 0xca, 0x81, 0x6a, 0xff, 0xb1, 0x06, 0x6d, 0x42, 0xb8,

-	0x10, 0x31, 0x37, 0xf6, 0x27, 0xe4, 0xca, 0x09, 0x23, 0x37, 0xc0, 0xf5, 0x42, 0x2a, 0xca, 0x40,

-	0x53, 0x60, 0xe8, 0x10, 0xb4, 0xb5, 0x28, 0x99, 0xbb, 0x7c, 0x4a, 0x68, 0x54, 0x2f, 0x4a, 0xdd,

-	0x76, 0x86, 0x5b, 0x19, 0x8c, 0xde, 0xc1, 0xce, 0x9d, 0x1f, 0x23, 0x73, 0x57, 0xd4, 0x57, 0x2f,

-	0xc9, 0x1e, 0xf4, 0x5f, 0xf7, 0x30, 0xce, 0x32, 0xae, 0xa3, 0xec, 0x75, 0xce, 0x3b, 0x04, 0x19,

-	0x50, 0x9b, 0x10, 0xc2, 0x9d, 0x69, 0x38, 0xc7, 0x4c, 0xf6, 0xe4, 0x24, 0x2e, 0x9f, 0xd5, 0xcb,

-	0xb2, 0x96, 0x1d, 0xc1, 0x0d, 0x05, 0x25, 0x3a, 0xb3, 0x5c, 0x3e, 0x6b, 0x1f, 0x82, 0x7a, 0x37,

-	0x1a, 0xa4, 0x42, 0xf1, 0xd4, 0x32, 0xad, 0x81, 0x96, 0x43, 0x15, 0x28, 0x0c, 0xcd, 0x17, 0x03,

-	0x4d, 0x41, 0x65, 0xc8, 0x0f, 0xce, 0xce, 0xb5, 0x8d, 0xb6, 0x01, 0xda, 0xc3, 0x0a, 0xd0, 0x26,

-	0x94, 0x2d, 0x7b, 0x74, 0x32, 0x18, 0x8f, 0xb5, 0x1c, 0xda, 0x02, 0x78, 0xf6, 0xc6, 0x1a, 0xd8,

-	0xaf, 0xcc, 0xf1, 0xc8, 0xd6, 0x94, 0xf6, 0xd7, 0x3c, 0x6c, 0x59, 0x94, 0x78, 0x98, 0xb1, 0x3e,

-	0xe6, 0x6e, 0x38, 0x67, 0xe8, 0x1f, 0x00, 0x39, 0x44, 0x27, 0x76, 0x23, 0x2c, 0x97, 0xaa, 0xda,

-	0xaa, 0x44, 0x4e, 0xdd, 0x08, 0xa3, 0x13, 0x00, 0x8f, 0x62, 0x97, 0x63, 0xdf, 0x71, 0xb9, 0x5c,

-	0xec, 0xe6, 0xf1, 0xae, 0x9e, 0x1e, 0x8c, 0xbe, 0x3e, 0x18, 0xfd, 0x6c, 0x7d, 0x30, 0xbd, 0xca,

-	0xf5, 0x4d, 0x33, 0xf7, 0xf1, 0x5b, 0x53, 0xb1, 0xd5, 0x2c, 0xee, 0x29, 0x47, 0xff, 0x02, 0xba,

-	0xc0, 0x34, 0xc6, 0x73, 0x47, 0x5c, 0x96, 0xd3, 0xed, 0x74, 0x9c, 0x98, 0xc9, 0xd5, 0x16, 0xec,

-	0xed, 0x94, 0x11, 0x0e, 0xdd, 0x4e, 0xe7, 0x94, 0x21, 0x1d, 0xfe, 0x8c, 0x70, 0x44, 0xe8, 0xd2,

-	0xf1, 0x48, 0x14, 0x85, 0xdc, 0x99, 0x2c, 0x39, 0x66, 0x72, 0xc7, 0x05, 0x7b, 0x27, 0xa5, 0x4e,

-	0x24, 0xd3, 0x13, 0x04, 0x1a, 0x42, 0x2b, 0xd3, 0xbf, 0x27, 0xf4, 0x22, 0x8c, 0x03, 0x87, 0x61,

-	0xee, 0x24, 0x34, 0xbc, 0x74, 0x39, 0xce, 0x82, 0x8b, 0x32, 0xf8, 0xef, 0x54, 0x77, 0x9e, 0xca,

-	0xc6, 0x98, 0x5b, 0xa9, 0x28, 0xf5, 0xe9, 0x43, 0xf3, 0x11, 0x1f, 0x36, 0x73, 0x29, 0xf6, 0x33,

-	0x9b, 0x92, 0xb4, 0xf9, 0xeb, 0xa1, 0xcd, 0x58, 0x6a, 0x52, 0x97, 0xff, 0x00, 0x92, 0x74, 0xc0,

-	0x4e, 0xe8, 0xcb, 0x25, 0x57, 0x7b, 0xd5, 0xd5, 0x4d, 0x53, 0xcd, 0xc6, 0x6e, 0xf6, 0x6d, 0x35,

-	0x13, 0x98, 0x3e, 0xda, 0x07, 0x6d, 0xc1, 0x30, 0xfd, 0x69, 0x2c, 0x15, 0x99, 0xa4, 0x2a, 0xf0,

-	0xfb, 0xa1, 0xec, 0x41, 0x19, 0x5f, 0x61, 0x4f, 0x78, 0xaa, 0x62, 0x45, 0x3d, 0x58, 0xdd, 0x34,

-	0x4b, 0x83, 0x2b, 0xec, 0x99, 0x7d, 0xbb, 0x24, 0x28, 0xd3, 0xef, 0xf9, 0xd7, 0xb7, 0x8d, 0xdc,

-	0x97, 0xdb, 0x46, 0xee, 0xc3, 0xaa, 0xa1, 0x5c, 0xaf, 0x1a, 0xca, 0xe7, 0x55, 0x43, 0xf9, 0xbe,

-	0x6a, 0x28, 0x6f, 0x9f, 0xff, 0xfe, 0xdf, 0xcb, 0x93, 0xec, 0xf7, 0x75, 0x6e, 0x52, 0x92, 0x7b,

-	0xff, 0xff, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x9a, 0x54, 0x17, 0xb5, 0x04, 0x00, 0x00,

-}

@@ -1,8 +1,10 @@

 package hcsshim

 import (

+	"context"

 	"fmt"

 	"os"

+	"sync"

 	"time"

 	"github.com/Microsoft/hcsshim/internal/hcs"

@@ -52,7 +54,10 @@ const (

 type ResourceModificationRequestResponse = schema1.ResourceModificationRequestResponse

 type container struct {

-	system *hcs.System

+	system   *hcs.System

+	waitOnce sync.Once

+	waitErr  error

+	waitCh   chan struct{}

 }

 // createComputeSystemAdditionalJSON is read from the environment at initialisation

@@ -71,61 +76,87 @@ func CreateContainer(id string, c *ContainerConfig) (Container, error) {

 		return nil, fmt.Errorf("failed to merge additional JSON '%s': %s", createContainerAdditionalJSON, err)

 	}

-	system, err := hcs.CreateComputeSystem(id, fullConfig)

+	system, err := hcs.CreateComputeSystem(context.Background(), id, fullConfig)

 	if err != nil {

 		return nil, err

 	}

-	return &container{system}, err

+	return &container{system: system}, err

 }

 // OpenContainer opens an existing container by ID.

 func OpenContainer(id string) (Container, error) {

-	system, err := hcs.OpenComputeSystem(id)

+	system, err := hcs.OpenComputeSystem(context.Background(), id)

 	if err != nil {

 		return nil, err

 	}

-	return &container{system}, err

+	return &container{system: system}, err

 }

 // GetContainers gets a list of the containers on the system that match the query

 func GetContainers(q ComputeSystemQuery) ([]ContainerProperties, error) {

-	return hcs.GetComputeSystems(q)

+	return hcs.GetComputeSystems(context.Background(), q)

 }

 // Start synchronously starts the container.

 func (container *container) Start() error {

-	return convertSystemError(container.system.Start(), container)

+	return convertSystemError(container.system.Start(context.Background()), container)

 }

 // Shutdown requests a container shutdown, but it may not actually be shutdown until Wait() succeeds.

 func (container *container) Shutdown() error {

-	return convertSystemError(container.system.Shutdown(), container)

+	err := container.system.Shutdown(context.Background())

+	if err != nil {

+		return convertSystemError(err, container)

+	}

+	return &ContainerError{Container: container, Err: ErrVmcomputeOperationPending, Operation: "hcsshim::ComputeSystem::Shutdown"}

 }

 // Terminate requests a container terminate, but it may not actually be terminated until Wait() succeeds.

 func (container *container) Terminate() error {

-	return convertSystemError(container.system.Terminate(), container)

+	err := container.system.Terminate(context.Background())

+	if err != nil {

+		return convertSystemError(err, container)

+	}

+	return &ContainerError{Container: container, Err: ErrVmcomputeOperationPending, Operation: "hcsshim::ComputeSystem::Terminate"}

 }

 // Waits synchronously waits for the container to shutdown or terminate.

 func (container *container) Wait() error {

-	return convertSystemError(container.system.Wait(), container)

+	err := container.system.Wait()

+	if err == nil {

+		err = container.system.ExitError()

+	}

+	return convertSystemError(err, container)

 }

 // WaitTimeout synchronously waits for the container to terminate or the duration to elapse. It

 // returns false if timeout occurs.

-func (container *container) WaitTimeout(t time.Duration) error {

-	return convertSystemError(container.system.WaitTimeout(t), container)

+func (container *container) WaitTimeout(timeout time.Duration) error {

+	container.waitOnce.Do(func() {

+		container.waitCh = make(chan struct{})

+		go func() {

+			container.waitErr = container.Wait()

+			close(container.waitCh)

+		}()

+	})

+	t := time.NewTimer(timeout)

+	defer t.Stop()

+	select {

+	case <-t.C:

+		return &ContainerError{Container: container, Err: ErrTimeout, Operation: "hcsshim::ComputeSystem::Wait"}

+	case <-container.waitCh:

+		return container.waitErr

+	}

 }

 // Pause pauses the execution of a container.

 func (container *container) Pause() error {

-	return convertSystemError(container.system.Pause(), container)

+	return convertSystemError(container.system.Pause(context.Background()), container)

 }

 // Resume resumes the execution of a container.

 func (container *container) Resume() error {

-	return convertSystemError(container.system.Resume(), container)

+	return convertSystemError(container.system.Resume(context.Background()), container)

 }

 // HasPendingUpdates returns true if the container has updates pending to install

@@ -135,7 +166,7 @@ func (container *container) HasPendingUpdates() (bool, error) {

 // Statistics returns statistics for the container. This is a legacy v1 call

 func (container *container) Statistics() (Statistics, error) {

-	properties, err := container.system.Properties(schema1.PropertyTypeStatistics)

+	properties, err := container.system.Properties(context.Background(), schema1.PropertyTypeStatistics)

 	if err != nil {

 		return Statistics{}, convertSystemError(err, container)

 	}

@@ -145,7 +176,7 @@ func (container *container) Statistics() (Statistics, error) {

 // ProcessList returns an array of ProcessListItems for the container. This is a legacy v1 call

 func (container *container) ProcessList() ([]ProcessListItem, error) {

-	properties, err := container.system.Properties(schema1.PropertyTypeProcessList)

+	properties, err := container.system.Properties(context.Background(), schema1.PropertyTypeProcessList)