diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
index fe11f8a2bb..13856085c6 100644
--- a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
+++ b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
@@ -10,6 +10,7 @@ import (
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	io "io"
 	math "math"
+	math_bits "math/bits"
 	reflect "reflect"
 	strings "strings"
 	time "time"
@@ -25,7 +26,7 @@ var _ = time.Kitchen
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type Options_DebugType int32
 
@@ -139,10 +140,11 @@ type Options struct {
 	// log_level specifies the logrus log level for the shim. Supported values are a string representation of the
 	// logrus log levels: "trace", "debug", "info", "warn", "error", "fatal", "panic". This setting will override
 	// the `debug` field if both are specified, unless the level specified is also "debug", as these are equivalent.
-	LogLevel             string   `protobuf:"bytes,16,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	LogLevel                    string   `protobuf:"bytes,16,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"`
+	DefaultContainerShmSizeInKb int32    `protobuf:"varint,17,opt,name=default_container_shm_size_in_kb,json=defaultContainerShmSizeInKb,proto3" json:"default_container_shm_size_in_kb,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
+	XXX_unrecognized            []byte   `json:"-"`
+	XXX_sizecache               int32    `json:"-"`
 }
 
 func (m *Options) Reset()      { *m = Options{} }
@@ -158,7 +160,7 @@ func (m *Options) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return xxx_messageInfo_Options.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
-		n, err := m.MarshalTo(b)
+		n, err := m.MarshalToSizedBuffer(b)
 		if err != nil {
 			return nil, err
 		}
@@ -207,7 +209,7 @@ func (m *ProcessDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro
 		return xxx_messageInfo_ProcessDetails.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
-		n, err := m.MarshalTo(b)
+		n, err := m.MarshalToSizedBuffer(b)
 		if err != nil {
 			return nil, err
 		}
@@ -238,71 +240,73 @@ func init() {
 }
 
 var fileDescriptor_b643df6839c75082 = []byte{
-	// 920 bytes of a gzipped FileDescriptorProto
+	// 945 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x5b, 0x6f, 0xdb, 0x36,
-	0x14, 0xc7, 0xad, 0x26, 0x71, 0xac, 0x93, 0x9b, 0xc3, 0x05, 0x98, 0x90, 0xac, 0xb6, 0x91, 0x0e,
-	0x68, 0x8a, 0x35, 0x52, 0xd2, 0x3d, 0x6e, 0xc0, 0xd0, 0xd8, 0x4e, 0xeb, 0x21, 0x17, 0x43, 0xce,
-	0xd2, 0x5d, 0x1e, 0x08, 0x5d, 0x18, 0x59, 0xa8, 0x28, 0x0a, 0x24, 0xed, 0xc5, 0x7d, 0xda, 0x47,
-	0xd8, 0xc7, 0xca, 0xe3, 0x1e, 0x07, 0x0c, 0xc8, 0x56, 0x7f, 0x88, 0x3d, 0x0f, 0xa4, 0xa8, 0xb4,
-	0x0b, 0x82, 0xbd, 0xec, 0xc9, 0xe4, 0xff, 0xfc, 0xf8, 0xe7, 0xe1, 0x21, 0x8f, 0x05, 0xe7, 0x49,
-	0x2a, 0xc7, 0x93, 0xd0, 0x8d, 0x18, 0xf5, 0x4e, 0xd3, 0x88, 0x33, 0xc1, 0xae, 0xa4, 0x37, 0x8e,
-	0x84, 0x18, 0xa7, 0xd4, 0x8b, 0x68, 0xec, 0x45, 0x2c, 0x97, 0x41, 0x9a, 0x13, 0x1e, 0xef, 0x2b,
-	0x6d, 0x9f, 0x4f, 0xf2, 0x71, 0x24, 0xf6, 0xa7, 0x87, 0x1e, 0x2b, 0x64, 0xca, 0x72, 0xe1, 0x95,
-	0x8a, 0x5b, 0x70, 0x26, 0x19, 0xda, 0xfa, 0xc0, 0xbb, 0x26, 0x30, 0x3d, 0xdc, 0xde, 0x4a, 0x58,
-	0xc2, 0x34, 0xe0, 0xa9, 0x51, 0xc9, 0x6e, 0xb7, 0x13, 0xc6, 0x92, 0x8c, 0x78, 0x7a, 0x16, 0x4e,
-	0xae, 0x3c, 0x99, 0x52, 0x22, 0x64, 0x40, 0x8b, 0x12, 0xd8, 0xfd, 0xbb, 0x0e, 0xcb, 0xe7, 0xe5,
-	0x2e, 0x68, 0x0b, 0x96, 0x62, 0x12, 0x4e, 0x12, 0xc7, 0xea, 0x58, 0x7b, 0x0d, 0xbf, 0x9c, 0xa0,
-	0x63, 0x00, 0x3d, 0xc0, 0x72, 0x56, 0x10, 0xe7, 0x51, 0xc7, 0xda, 0x5b, 0x7f, 0xf1, 0xd4, 0x7d,
-	0x28, 0x07, 0xd7, 0x18, 0xb9, 0x3d, 0xc5, 0x5f, 0xcc, 0x0a, 0xe2, 0xdb, 0x71, 0x35, 0x44, 0x4f,
-	0x60, 0x8d, 0x93, 0x24, 0x15, 0x92, 0xcf, 0x30, 0x67, 0x4c, 0x3a, 0x0b, 0x1d, 0x6b, 0xcf, 0xf6,
-	0x57, 0x2b, 0xd1, 0x67, 0x4c, 0x2a, 0x48, 0x04, 0x79, 0x1c, 0xb2, 0x6b, 0x9c, 0xd2, 0x20, 0x21,
-	0xce, 0x62, 0x09, 0x19, 0x71, 0xa0, 0x34, 0xf4, 0x0c, 0x9a, 0x15, 0x54, 0x64, 0x81, 0xbc, 0x62,
-	0x9c, 0x3a, 0x4b, 0x9a, 0xdb, 0x30, 0xfa, 0xd0, 0xc8, 0xe8, 0x27, 0xd8, 0xbc, 0xf3, 0x13, 0x2c,
-	0x0b, 0x54, 0x7e, 0x4e, 0x5d, 0x9f, 0xc1, 0xfd, 0xef, 0x33, 0x8c, 0xcc, 0x8e, 0xd5, 0x2a, 0xbf,
-	0xda, 0xf3, 0x4e, 0x41, 0x1e, 0x6c, 0x85, 0x8c, 0x49, 0x7c, 0x95, 0x66, 0x44, 0xe8, 0x33, 0xe1,
-	0x22, 0x90, 0x63, 0x67, 0x59, 0xe7, 0xb2, 0xa9, 0x62, 0xc7, 0x2a, 0xa4, 0x4e, 0x36, 0x0c, 0xe4,
-	0x18, 0x3d, 0x07, 0x34, 0xa5, 0xb8, 0xe0, 0x2c, 0x22, 0x42, 0x30, 0x8e, 0x23, 0x36, 0xc9, 0xa5,
-	0xd3, 0xe8, 0x58, 0x7b, 0x4b, 0x7e, 0x73, 0x4a, 0x87, 0x55, 0xa0, 0xab, 0x74, 0xe4, 0xc2, 0xd6,
-	0x94, 0x62, 0x4a, 0x28, 0xe3, 0x33, 0x2c, 0xd2, 0x77, 0x04, 0xa7, 0x39, 0xa6, 0xa1, 0x63, 0x57,
-	0xfc, 0xa9, 0x0e, 0x8d, 0xd2, 0x77, 0x64, 0x90, 0x9f, 0x86, 0xa8, 0x05, 0xf0, 0x6a, 0xf8, 0xdd,
-	0xe5, 0xeb, 0x9e, 0xda, 0xcb, 0x01, 0x9d, 0xc4, 0x47, 0x0a, 0xfa, 0x1a, 0x76, 0x44, 0x14, 0x64,
-	0x04, 0x47, 0xc5, 0x04, 0x67, 0x29, 0x4d, 0xa5, 0xc0, 0x92, 0x61, 0x73, 0x2c, 0x67, 0x45, 0x5f,
-	0xfa, 0xa7, 0x1a, 0xe9, 0x16, 0x93, 0x13, 0x0d, 0x5c, 0x30, 0x53, 0x07, 0x74, 0x0a, 0x9f, 0xc7,
-	0xe4, 0x2a, 0x98, 0x64, 0x12, 0xdf, 0xd5, 0x0d, 0x8b, 0x88, 0x07, 0x32, 0x1a, 0xdf, 0x65, 0x97,
-	0x84, 0xce, 0xaa, 0xce, 0xae, 0x6d, 0xd8, 0x6e, 0x85, 0x8e, 0x4a, 0xb2, 0x4c, 0xf6, 0x55, 0x88,
-	0xbe, 0x81, 0xc7, 0x95, 0xdd, 0x94, 0x3e, 0xe4, 0xb3, 0xa6, 0x7d, 0x1c, 0x03, 0x5d, 0xd2, 0xfb,
-	0x06, 0xea, 0xa5, 0x8c, 0x03, 0x4e, 0xaa, 0xb5, 0xce, 0xba, 0xce, 0x7f, 0x55, 0x8b, 0x06, 0x46,
-	0x1d, 0x58, 0x39, 0xeb, 0x0e, 0x39, 0xbb, 0x9e, 0xbd, 0x8c, 0x63, 0xee, 0x6c, 0xe8, 0x9a, 0x7c,
-	0x2c, 0xa1, 0x1d, 0xb0, 0x33, 0x96, 0xe0, 0x8c, 0x4c, 0x49, 0xe6, 0x34, 0x75, 0xbc, 0x91, 0xb1,
-	0xe4, 0x44, 0xcd, 0x77, 0x9f, 0x81, 0x7d, 0xf7, 0x94, 0x91, 0x0d, 0x4b, 0x67, 0xc3, 0xc1, 0xb0,
-	0xdf, 0xac, 0xa1, 0x06, 0x2c, 0x1e, 0x0f, 0x4e, 0xfa, 0x4d, 0x0b, 0x2d, 0xc3, 0x42, 0xff, 0xe2,
-	0x4d, 0xf3, 0xd1, 0xae, 0x07, 0xcd, 0xfb, 0x2f, 0x06, 0xad, 0xc0, 0xf2, 0xd0, 0x3f, 0xef, 0xf6,
-	0x47, 0xa3, 0x66, 0x0d, 0xad, 0x03, 0xbc, 0xfe, 0x61, 0xd8, 0xf7, 0x2f, 0x07, 0xa3, 0x73, 0xbf,
-	0x69, 0xed, 0xfe, 0xb1, 0x00, 0xeb, 0xe6, 0xc2, 0x7b, 0x44, 0x06, 0x69, 0x26, 0xd0, 0x63, 0x00,
-	0xfd, 0xe8, 0x71, 0x1e, 0x50, 0xa2, 0x9b, 0xd0, 0xf6, 0x6d, 0xad, 0x9c, 0x05, 0x94, 0xa0, 0x2e,
-	0x40, 0xc4, 0x49, 0x20, 0x49, 0x8c, 0x03, 0xa9, 0x1b, 0x71, 0xe5, 0xc5, 0xb6, 0x5b, 0x36, 0xb8,
-	0x5b, 0x35, 0xb8, 0x7b, 0x51, 0x35, 0xf8, 0x51, 0xe3, 0xe6, 0xb6, 0x5d, 0xfb, 0xf5, 0xcf, 0xb6,
-	0xe5, 0xdb, 0x66, 0xdd, 0x4b, 0x89, 0xbe, 0x00, 0xf4, 0x96, 0xf0, 0x9c, 0x64, 0x58, 0xfd, 0x13,
-	0xe0, 0xc3, 0x83, 0x03, 0x9c, 0x0b, 0xdd, 0x8a, 0x8b, 0xfe, 0x46, 0x19, 0x51, 0x0e, 0x87, 0x07,
-	0x07, 0x67, 0x02, 0xb9, 0xf0, 0x89, 0x79, 0x7e, 0x11, 0xa3, 0x34, 0x95, 0x38, 0x9c, 0x49, 0x22,
-	0x74, 0x4f, 0x2e, 0xfa, 0x9b, 0x65, 0xa8, 0xab, 0x23, 0x47, 0x2a, 0x80, 0x8e, 0xa1, 0x63, 0xf8,
-	0x9f, 0x19, 0x7f, 0x9b, 0xe6, 0x09, 0x16, 0x44, 0xe2, 0x82, 0xa7, 0xd3, 0x40, 0x12, 0xb3, 0x78,
-	0x49, 0x2f, 0xfe, 0xac, 0xe4, 0xde, 0x94, 0xd8, 0x88, 0xc8, 0x61, 0x09, 0x95, 0x3e, 0x3d, 0x68,
-	0x3f, 0xe0, 0xa3, 0x6f, 0x36, 0x36, 0x36, 0x75, 0x6d, 0xb3, 0x73, 0xdf, 0x66, 0xa4, 0x99, 0xd2,
-	0xe5, 0x39, 0x80, 0x69, 0x35, 0x9c, 0xc6, 0xba, 0x29, 0xd7, 0x8e, 0xd6, 0xe6, 0xb7, 0x6d, 0xdb,
-	0x94, 0x7d, 0xd0, 0xf3, 0x6d, 0x03, 0x0c, 0x62, 0xf4, 0x14, 0x9a, 0x13, 0x41, 0xf8, 0xbf, 0xca,
-	0xd2, 0xd0, 0x9b, 0xac, 0x29, 0xfd, 0x43, 0x51, 0x9e, 0xc0, 0x32, 0xb9, 0x26, 0x91, 0xf2, 0x54,
-	0x9d, 0x68, 0x1f, 0xc1, 0xfc, 0xb6, 0x5d, 0xef, 0x5f, 0x93, 0x68, 0xd0, 0xf3, 0xeb, 0x2a, 0x34,
-	0x88, 0x8f, 0xe2, 0x9b, 0xf7, 0xad, 0xda, 0xef, 0xef, 0x5b, 0xb5, 0x5f, 0xe6, 0x2d, 0xeb, 0x66,
-	0xde, 0xb2, 0x7e, 0x9b, 0xb7, 0xac, 0xbf, 0xe6, 0x2d, 0xeb, 0xc7, 0x6f, 0xff, 0xff, 0xe7, 0xe0,
-	0x2b, 0xf3, 0xfb, 0x7d, 0x2d, 0xac, 0xeb, 0x7b, 0xff, 0xf2, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x84, 0x30, 0x9b, 0x7c, 0x65, 0x06, 0x00, 0x00,
+	0x14, 0xc7, 0xad, 0xe6, 0x62, 0xeb, 0xe4, 0xe6, 0x70, 0x01, 0x26, 0x24, 0xab, 0x6d, 0xa4, 0x03,
+	0x9a, 0x62, 0x8d, 0x94, 0x74, 0x8f, 0x1b, 0x30, 0x34, 0xb6, 0xd3, 0x7a, 0xcb, 0xc5, 0x90, 0xb3,
+	0x74, 0x97, 0x07, 0x42, 0x17, 0x46, 0x12, 0x22, 0x8a, 0x82, 0x48, 0x7b, 0x71, 0x9f, 0xf6, 0x11,
+	0xf6, 0x85, 0xf6, 0x9e, 0xc7, 0x3d, 0x0e, 0x18, 0x90, 0xad, 0xfe, 0x24, 0x03, 0x29, 0xca, 0xed,
+	0xb2, 0x60, 0x2f, 0x7b, 0xb2, 0xf4, 0x3f, 0x3f, 0xfe, 0x79, 0xce, 0x11, 0x0f, 0x0d, 0xe7, 0x51,
+	0x22, 0xe2, 0xb1, 0x6f, 0x07, 0x8c, 0x3a, 0xa7, 0x49, 0x50, 0x30, 0xce, 0xae, 0x84, 0x13, 0x07,
+	0x9c, 0xc7, 0x09, 0x75, 0x02, 0x1a, 0x3a, 0x01, 0xcb, 0x84, 0x97, 0x64, 0xa4, 0x08, 0xf7, 0xa5,
+	0xb6, 0x5f, 0x8c, 0xb3, 0x38, 0xe0, 0xfb, 0x93, 0x43, 0x87, 0xe5, 0x22, 0x61, 0x19, 0x77, 0x4a,
+	0xc5, 0xce, 0x0b, 0x26, 0x18, 0xda, 0x7a, 0xcf, 0xdb, 0x3a, 0x30, 0x39, 0xdc, 0xde, 0x8a, 0x58,
+	0xc4, 0x14, 0xe0, 0xc8, 0xa7, 0x92, 0xdd, 0x6e, 0x47, 0x8c, 0x45, 0x29, 0x71, 0xd4, 0x9b, 0x3f,
+	0xbe, 0x72, 0x44, 0x42, 0x09, 0x17, 0x1e, 0xcd, 0x4b, 0x60, 0xf7, 0xd7, 0x3a, 0xd4, 0xcf, 0xcb,
+	0x5d, 0xd0, 0x16, 0x2c, 0x85, 0xc4, 0x1f, 0x47, 0x96, 0xd1, 0x31, 0xf6, 0x1a, 0x6e, 0xf9, 0x82,
+	0x8e, 0x01, 0xd4, 0x03, 0x16, 0xd3, 0x9c, 0x58, 0x8f, 0x3a, 0xc6, 0xde, 0xfa, 0x8b, 0xa7, 0xf6,
+	0x43, 0x39, 0xd8, 0xda, 0xc8, 0xee, 0x49, 0xfe, 0x62, 0x9a, 0x13, 0xd7, 0x0c, 0xab, 0x47, 0xf4,
+	0x04, 0xd6, 0x0a, 0x12, 0x25, 0x5c, 0x14, 0x53, 0x5c, 0x30, 0x26, 0xac, 0x85, 0x8e, 0xb1, 0x67,
+	0xba, 0xab, 0x95, 0xe8, 0x32, 0x26, 0x24, 0xc4, 0xbd, 0x2c, 0xf4, 0xd9, 0x0d, 0x4e, 0xa8, 0x17,
+	0x11, 0x6b, 0xb1, 0x84, 0xb4, 0x38, 0x90, 0x1a, 0x7a, 0x06, 0xcd, 0x0a, 0xca, 0x53, 0x4f, 0x5c,
+	0xb1, 0x82, 0x5a, 0x4b, 0x8a, 0xdb, 0xd0, 0xfa, 0x50, 0xcb, 0xe8, 0x47, 0xd8, 0x9c, 0xfb, 0x71,
+	0x96, 0x7a, 0x32, 0x3f, 0x6b, 0x59, 0xd5, 0x60, 0xff, 0x77, 0x0d, 0x23, 0xbd, 0x63, 0xb5, 0xca,
+	0xad, 0xf6, 0x9c, 0x2b, 0xc8, 0x81, 0x2d, 0x9f, 0x31, 0x81, 0xaf, 0x92, 0x94, 0x70, 0x55, 0x13,
+	0xce, 0x3d, 0x11, 0x5b, 0x75, 0x95, 0xcb, 0xa6, 0x8c, 0x1d, 0xcb, 0x90, 0xac, 0x6c, 0xe8, 0x89,
+	0x18, 0x3d, 0x07, 0x34, 0xa1, 0x38, 0x2f, 0x58, 0x40, 0x38, 0x67, 0x05, 0x0e, 0xd8, 0x38, 0x13,
+	0x56, 0xa3, 0x63, 0xec, 0x2d, 0xb9, 0xcd, 0x09, 0x1d, 0x56, 0x81, 0xae, 0xd4, 0x91, 0x0d, 0x5b,
+	0x13, 0x8a, 0x29, 0xa1, 0xac, 0x98, 0x62, 0x9e, 0xbc, 0x25, 0x38, 0xc9, 0x30, 0xf5, 0x2d, 0xb3,
+	0xe2, 0x4f, 0x55, 0x68, 0x94, 0xbc, 0x25, 0x83, 0xec, 0xd4, 0x47, 0x2d, 0x80, 0x57, 0xc3, 0x6f,
+	0x2f, 0x5f, 0xf7, 0xe4, 0x5e, 0x16, 0xa8, 0x24, 0x3e, 0x50, 0xd0, 0x97, 0xb0, 0xc3, 0x03, 0x2f,
+	0x25, 0x38, 0xc8, 0xc7, 0x38, 0x4d, 0x68, 0x22, 0x38, 0x16, 0x0c, 0xeb, 0xb2, 0xac, 0x15, 0xf5,
+	0xd1, 0x3f, 0x56, 0x48, 0x37, 0x1f, 0x9f, 0x28, 0xe0, 0x82, 0xe9, 0x3e, 0xa0, 0x53, 0xf8, 0x34,
+	0x24, 0x57, 0xde, 0x38, 0x15, 0x78, 0xde, 0x37, 0xcc, 0x83, 0xc2, 0x13, 0x41, 0x3c, 0xcf, 0x2e,
+	0xf2, 0xad, 0x55, 0x95, 0x5d, 0x5b, 0xb3, 0xdd, 0x0a, 0x1d, 0x95, 0x64, 0x99, 0xec, 0x2b, 0x1f,
+	0x7d, 0x05, 0x8f, 0x2b, 0xbb, 0x09, 0x7d, 0xc8, 0x67, 0x4d, 0xf9, 0x58, 0x1a, 0xba, 0xa4, 0xf7,
+	0x0d, 0xe4, 0x49, 0x89, 0xbd, 0x82, 0x54, 0x6b, 0xad, 0x75, 0x95, 0xff, 0xaa, 0x12, 0x35, 0x8c,
+	0x3a, 0xb0, 0x72, 0xd6, 0x1d, 0x16, 0xec, 0x66, 0xfa, 0x32, 0x0c, 0x0b, 0x6b, 0x43, 0xf5, 0xe4,
+	0x43, 0x09, 0xed, 0x80, 0x99, 0xb2, 0x08, 0xa7, 0x64, 0x42, 0x52, 0xab, 0xa9, 0xe2, 0x8d, 0x94,
+	0x45, 0x27, 0xf2, 0x1d, 0xf5, 0xa1, 0xf3, 0x40, 0xcd, 0x31, 0x9d, 0xe7, 0x79, 0xed, 0x5b, 0x9b,
+	0x2a, 0xcf, 0x9d, 0x7f, 0xd5, 0x1b, 0xd3, 0x32, 0xd5, 0x6f, 0xfc, 0xdd, 0x67, 0x60, 0xce, 0x27,
+	0x02, 0x99, 0xb0, 0x74, 0x36, 0x1c, 0x0c, 0xfb, 0xcd, 0x1a, 0x6a, 0xc0, 0xe2, 0xf1, 0xe0, 0xa4,
+	0xdf, 0x34, 0x50, 0x1d, 0x16, 0xfa, 0x17, 0x6f, 0x9a, 0x8f, 0x76, 0x1d, 0x68, 0xde, 0x3f, 0x78,
+	0x68, 0x05, 0xea, 0x43, 0xf7, 0xbc, 0xdb, 0x1f, 0x8d, 0x9a, 0x35, 0xb4, 0x0e, 0xf0, 0xfa, 0xfb,
+	0x61, 0xdf, 0xbd, 0x1c, 0x8c, 0xce, 0xdd, 0xa6, 0xb1, 0xfb, 0xc7, 0x02, 0xac, 0xeb, 0x73, 0xd3,
+	0x23, 0xc2, 0x4b, 0x52, 0x8e, 0x1e, 0x03, 0xa8, 0xd9, 0xc1, 0x99, 0x47, 0x89, 0x9a, 0x65, 0xd3,
+	0x35, 0x95, 0x72, 0xe6, 0x51, 0x82, 0xba, 0x00, 0x41, 0x41, 0x3c, 0x41, 0x42, 0xec, 0x09, 0x35,
+	0xcf, 0x2b, 0x2f, 0xb6, 0xed, 0xf2, 0x9e, 0xb0, 0xab, 0x7b, 0xc2, 0xbe, 0xa8, 0xee, 0x89, 0xa3,
+	0xc6, 0xed, 0x5d, 0xbb, 0xf6, 0xcb, 0x9f, 0x6d, 0xc3, 0x35, 0xf5, 0xba, 0x97, 0x02, 0x7d, 0x06,
+	0xe8, 0x9a, 0x14, 0x19, 0x49, 0xb1, 0xbc, 0x50, 0xf0, 0xe1, 0xc1, 0x01, 0xce, 0xb8, 0x9a, 0xe8,
+	0x45, 0x77, 0xa3, 0x8c, 0x48, 0x87, 0xc3, 0x83, 0x83, 0x33, 0x8e, 0x6c, 0xf8, 0x48, 0x9f, 0xe2,
+	0x80, 0x51, 0x9a, 0x08, 0xec, 0x4f, 0x05, 0xe1, 0x6a, 0xb4, 0x17, 0xdd, 0xcd, 0x32, 0xd4, 0x55,
+	0x91, 0x23, 0x19, 0x40, 0xc7, 0xd0, 0xd1, 0xfc, 0x4f, 0xac, 0xb8, 0x4e, 0xb2, 0x08, 0x73, 0x22,
+	0x70, 0x5e, 0x24, 0x13, 0x4f, 0x10, 0xbd, 0x78, 0x49, 0x2d, 0xfe, 0xa4, 0xe4, 0xde, 0x94, 0xd8,
+	0x88, 0x88, 0x61, 0x09, 0x95, 0x3e, 0x3d, 0x68, 0x3f, 0xe0, 0xa3, 0x0e, 0x48, 0xa8, 0x6d, 0x96,
+	0x95, 0xcd, 0xce, 0x7d, 0x9b, 0x91, 0x62, 0x4a, 0x97, 0xe7, 0x00, 0x7a, 0x62, 0x71, 0x12, 0xaa,
+	0xd9, 0x5e, 0x3b, 0x5a, 0x9b, 0xdd, 0xb5, 0x4d, 0xdd, 0xf6, 0x41, 0xcf, 0x35, 0x35, 0x30, 0x08,
+	0xd1, 0x53, 0x68, 0x8e, 0x39, 0x29, 0xfe, 0xd1, 0x96, 0x86, 0xda, 0x64, 0x4d, 0xea, 0xef, 0x9b,
+	0xf2, 0x04, 0xea, 0xe4, 0x86, 0x04, 0xd2, 0x53, 0x0e, 0xb4, 0x79, 0x04, 0xb3, 0xbb, 0xf6, 0x72,
+	0xff, 0x86, 0x04, 0x83, 0x9e, 0xbb, 0x2c, 0x43, 0x83, 0xf0, 0x28, 0xbc, 0x7d, 0xd7, 0xaa, 0xfd,
+	0xfe, 0xae, 0x55, 0xfb, 0x79, 0xd6, 0x32, 0x6e, 0x67, 0x2d, 0xe3, 0xb7, 0x59, 0xcb, 0xf8, 0x6b,
+	0xd6, 0x32, 0x7e, 0xf8, 0xfa, 0xff, 0xff, 0xab, 0x7c, 0xa1, 0x7f, 0xbf, 0xab, 0xf9, 0xcb, 0xea,
+	0xbb, 0x7f, 0xfe, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, 0xa9, 0x17, 0x5b, 0xac, 0x06, 0x00,
+	0x00,
 }
 
 func (m *Options) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
 	if err != nil {
 		return nil, err
 	}
@@ -310,124 +314,144 @@ func (m *Options) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *Options) MarshalTo(dAtA []byte) (int, error) {
-	var i int
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Options) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	if m.Debug {
-		dAtA[i] = 0x8
-		i++
-		if m.Debug {
+	if m.XXX_unrecognized != nil {
+		i -= len(m.XXX_unrecognized)
+		copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	if m.DefaultContainerShmSizeInKb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerShmSizeInKb))
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0x88
+	}
+	if len(m.LogLevel) > 0 {
+		i -= len(m.LogLevel)
+		copy(dAtA[i:], m.LogLevel)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel)))
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0x82
+	}
+	if len(m.NCProxyAddr) > 0 {
+		i -= len(m.NCProxyAddr)
+		copy(dAtA[i:], m.NCProxyAddr)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr)))
+		i--
+		dAtA[i] = 0x7a
+	}
+	if m.ShareScratch {
+		i--
+		if m.ShareScratch {
 			dAtA[i] = 1
 		} else {
 			dAtA[i] = 0
 		}
-		i++
-	}
-	if m.DebugType != 0 {
-		dAtA[i] = 0x10
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType))
+		i--
+		dAtA[i] = 0x70
 	}
-	if len(m.RegistryRoot) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot)))
-		i += copy(dAtA[i:], m.RegistryRoot)
+	if m.DefaultVmScratchSizeInGb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb))
+		i--
+		dAtA[i] = 0x68
 	}
-	if len(m.SandboxImage) > 0 {
-		dAtA[i] = 0x22
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage)))
-		i += copy(dAtA[i:], m.SandboxImage)
+	if m.DefaultContainerScratchSizeInGb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb))
+		i--
+		dAtA[i] = 0x60
 	}
-	if len(m.SandboxPlatform) > 0 {
-		dAtA[i] = 0x2a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform)))
-		i += copy(dAtA[i:], m.SandboxPlatform)
+	if m.ScaleCpuLimitsToSandbox {
+		i--
+		if m.ScaleCpuLimitsToSandbox {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x58
 	}
-	if m.SandboxIsolation != 0 {
-		dAtA[i] = 0x30
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation))
+	if len(m.GPUVHDPath) > 0 {
+		i -= len(m.GPUVHDPath)
+		copy(dAtA[i:], m.GPUVHDPath)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath)))
+		i--
+		dAtA[i] = 0x52
 	}
-	if len(m.BootFilesRootPath) > 0 {
-		dAtA[i] = 0x3a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath)))
-		i += copy(dAtA[i:], m.BootFilesRootPath)
+	if m.VmMemorySizeInMb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb))
+		i--
+		dAtA[i] = 0x48
 	}
 	if m.VmProcessorCount != 0 {
-		dAtA[i] = 0x40
-		i++
 		i = encodeVarintRunhcs(dAtA, i, uint64(m.VmProcessorCount))
+		i--
+		dAtA[i] = 0x40
 	}
-	if m.VmMemorySizeInMb != 0 {
-		dAtA[i] = 0x48
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb))
+	if len(m.BootFilesRootPath) > 0 {
+		i -= len(m.BootFilesRootPath)
+		copy(dAtA[i:], m.BootFilesRootPath)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath)))
+		i--
+		dAtA[i] = 0x3a
 	}
-	if len(m.GPUVHDPath) > 0 {
-		dAtA[i] = 0x52
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath)))
-		i += copy(dAtA[i:], m.GPUVHDPath)
+	if m.SandboxIsolation != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation))
+		i--
+		dAtA[i] = 0x30
 	}
-	if m.ScaleCpuLimitsToSandbox {
-		dAtA[i] = 0x58
-		i++
-		if m.ScaleCpuLimitsToSandbox {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
+	if len(m.SandboxPlatform) > 0 {
+		i -= len(m.SandboxPlatform)
+		copy(dAtA[i:], m.SandboxPlatform)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform)))
+		i--
+		dAtA[i] = 0x2a
 	}
-	if m.DefaultContainerScratchSizeInGb != 0 {
-		dAtA[i] = 0x60
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb))
+	if len(m.SandboxImage) > 0 {
+		i -= len(m.SandboxImage)
+		copy(dAtA[i:], m.SandboxImage)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage)))
+		i--
+		dAtA[i] = 0x22
 	}
-	if m.DefaultVmScratchSizeInGb != 0 {
-		dAtA[i] = 0x68
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb))
+	if len(m.RegistryRoot) > 0 {
+		i -= len(m.RegistryRoot)
+		copy(dAtA[i:], m.RegistryRoot)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot)))
+		i--
+		dAtA[i] = 0x1a
 	}
-	if m.ShareScratch {
-		dAtA[i] = 0x70
-		i++
-		if m.ShareScratch {
+	if m.DebugType != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType))
+		i--
+		dAtA[i] = 0x10
+	}
+	if m.Debug {
+		i--
+		if m.Debug {
 			dAtA[i] = 1
 		} else {
 			dAtA[i] = 0
 		}
-		i++
-	}
-	if len(m.NCProxyAddr) > 0 {
-		dAtA[i] = 0x7a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr)))
-		i += copy(dAtA[i:], m.NCProxyAddr)
-	}
-	if len(m.LogLevel) > 0 {
-		dAtA[i] = 0x82
-		i++
-		dAtA[i] = 0x1
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel)))
-		i += copy(dAtA[i:], m.LogLevel)
-	}
-	if m.XXX_unrecognized != nil {
-		i += copy(dAtA[i:], m.XXX_unrecognized)
+		i--
+		dAtA[i] = 0x8
 	}
-	return i, nil
+	return len(dAtA) - i, nil
 }
 
 func (m *ProcessDetails) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
 	if err != nil {
 		return nil, err
 	}
@@ -435,74 +459,84 @@ func (m *ProcessDetails) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *ProcessDetails) MarshalTo(dAtA []byte) (int, error) {
-	var i int
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ProcessDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	if len(m.ImageName) > 0 {
-		dAtA[i] = 0xa
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName)))
-		i += copy(dAtA[i:], m.ImageName)
-	}
-	dAtA[i] = 0x12
-	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
+	if m.XXX_unrecognized != nil {
+		i -= len(m.XXX_unrecognized)
+		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i += n1
-	if m.KernelTime_100Ns != 0 {
-		dAtA[i] = 0x18
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns))
+	if len(m.ExecID) > 0 {
+		i -= len(m.ExecID)
+		copy(dAtA[i:], m.ExecID)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID)))
+		i--
+		dAtA[i] = 0x4a
 	}
-	if m.MemoryCommitBytes != 0 {
-		dAtA[i] = 0x20
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes))
+	if m.UserTime_100Ns != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns))
+		i--
+		dAtA[i] = 0x40
 	}
-	if m.MemoryWorkingSetPrivateBytes != 0 {
-		dAtA[i] = 0x28
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes))
+	if m.ProcessID != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID))
+		i--
+		dAtA[i] = 0x38
 	}
 	if m.MemoryWorkingSetSharedBytes != 0 {
-		dAtA[i] = 0x30
-		i++
 		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetSharedBytes))
+		i--
+		dAtA[i] = 0x30
 	}
-	if m.ProcessID != 0 {
-		dAtA[i] = 0x38
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID))
+	if m.MemoryWorkingSetPrivateBytes != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes))
+		i--
+		dAtA[i] = 0x28
 	}
-	if m.UserTime_100Ns != 0 {
-		dAtA[i] = 0x40
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns))
+	if m.MemoryCommitBytes != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes))
+		i--
+		dAtA[i] = 0x20
 	}
-	if len(m.ExecID) > 0 {
-		dAtA[i] = 0x4a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID)))
-		i += copy(dAtA[i:], m.ExecID)
+	if m.KernelTime_100Ns != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns))
+		i--
+		dAtA[i] = 0x18
 	}
-	if m.XXX_unrecognized != nil {
-		i += copy(dAtA[i:], m.XXX_unrecognized)
+	n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
+	if err1 != nil {
+		return 0, err1
 	}
-	return i, nil
+	i -= n1
+	i = encodeVarintRunhcs(dAtA, i, uint64(n1))
+	i--
+	dAtA[i] = 0x12
+	if len(m.ImageName) > 0 {
+		i -= len(m.ImageName)
+		copy(dAtA[i:], m.ImageName)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
 }
 
 func encodeVarintRunhcs(dAtA []byte, offset int, v uint64) int {
+	offset -= sovRunhcs(v)
+	base := offset
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
 		v >>= 7
 		offset++
 	}
 	dAtA[offset] = uint8(v)
-	return offset + 1
+	return base
 }
 func (m *Options) Size() (n int) {
 	if m == nil {
@@ -565,6 +599,9 @@ func (m *Options) Size() (n int) {
 	if l > 0 {
 		n += 2 + l + sovRunhcs(uint64(l))
 	}
+	if m.DefaultContainerShmSizeInKb != 0 {
+		n += 2 + sovRunhcs(uint64(m.DefaultContainerShmSizeInKb))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -612,14 +649,7 @@ func (m *ProcessDetails) Size() (n int) {
 }
 
 func sovRunhcs(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
+	return (math_bits.Len64(x|1) + 6) / 7
 }
 func sozRunhcs(x uint64) (n int) {
 	return sovRunhcs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -645,6 +675,7 @@ func (this *Options) String() string {
 		`ShareScratch:` + fmt.Sprintf("%v", this.ShareScratch) + `,`,
 		`NCProxyAddr:` + fmt.Sprintf("%v", this.NCProxyAddr) + `,`,
 		`LogLevel:` + fmt.Sprintf("%v", this.LogLevel) + `,`,
+		`DefaultContainerShmSizeInKb:` + fmt.Sprintf("%v", this.DefaultContainerShmSizeInKb) + `,`,
 		`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
 		`}`,
 	}, "")
@@ -656,7 +687,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", "types.Timestamp", 1), `&`, ``, 1) + `,`,
+		`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "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) + `,`,
@@ -1104,16 +1135,32 @@ func (m *Options) Unmarshal(dAtA []byte) error {
 			}
 			m.LogLevel = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 17:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DefaultContainerShmSizeInKb", wireType)
+			}
+			m.DefaultContainerShmSizeInKb = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRunhcs
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.DefaultContainerShmSizeInKb |= int32(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRunhcs(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRunhcs
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRunhcs
 			}
 			if (iNdEx + skippy) > l {
@@ -1375,10 +1422,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRunhcs
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRunhcs
 			}
 			if (iNdEx + skippy) > l {
@@ -1397,6 +1441,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {
 func skipRunhcs(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
+	depth := 0
 	for iNdEx < l {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
@@ -1428,10 +1473,8 @@ func skipRunhcs(dAtA []byte) (n int, err error) {
 					break
 				}
 			}
-			return iNdEx, nil
 		case 1:
 			iNdEx += 8
-			return iNdEx, nil
 		case 2:
 			var length int
 			for shift := uint(0); ; shift += 7 {
@@ -1452,55 +1495,30 @@ func skipRunhcs(dAtA []byte) (n int, err error) {
 				return 0, ErrInvalidLengthRunhcs
 			}
 			iNdEx += length
-			if iNdEx < 0 {
-				return 0, ErrInvalidLengthRunhcs
-			}
-			return iNdEx, nil
 		case 3:
-			for {
-				var innerWire uint64
-				var start int = iNdEx
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return 0, ErrIntOverflowRunhcs
-					}
-					if iNdEx >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := skipRunhcs(dAtA[start:])
-				if err != nil {
-					return 0, err
-				}
-				iNdEx = start + next
-				if iNdEx < 0 {
-					return 0, ErrInvalidLengthRunhcs
-				}
-			}
-			return iNdEx, nil
+			depth++
 		case 4:
-			return iNdEx, nil
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupRunhcs
+			}
+			depth--
 		case 5:
 			iNdEx += 4
-			return iNdEx, nil
 		default:
 			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
 		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthRunhcs
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
 	}
-	panic("unreachable")
+	return 0, io.ErrUnexpectedEOF
 }
 
 var (
-	ErrInvalidLengthRunhcs = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowRunhcs   = fmt.Errorf("proto: integer overflow")
+	ErrInvalidLengthRunhcs        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowRunhcs          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupRunhcs = fmt.Errorf("proto: unexpected end of group")
 )
diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.proto b/cmd/containerd-shim-runhcs-v1/options/runhcs.proto
index 90f3376ffc..cabd83d960 100644
--- a/cmd/containerd-shim-runhcs-v1/options/runhcs.proto
+++ b/cmd/containerd-shim-runhcs-v1/options/runhcs.proto
@@ -93,6 +93,8 @@ message Options {
 	// logrus log levels: "trace", "debug", "info", "warn", "error", "fatal", "panic". This setting will override
 	// the `debug` field if both are specified, unless the level specified is also "debug", as these are equivalent.
 	string log_level = 16;
+
+	int32 default_container_shm_size_in_kb = 17;
 }
 
 // ProcessDetails contains additional information about a process. This is the additional
diff --git a/internal/oci/uvm.go b/internal/oci/uvm.go
index fcf41fba08..d8d3943092 100644
--- a/internal/oci/uvm.go
+++ b/internal/oci/uvm.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/Microsoft/hcsshim/pkg/annotations"
 	"strconv"
 	"strings"
 
@@ -13,6 +12,7 @@ import (
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/logfields"
 	"github.com/Microsoft/hcsshim/internal/uvm"
+	"github.com/Microsoft/hcsshim/pkg/annotations"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 )
@@ -395,5 +395,9 @@ func UpdateSpecFromOptions(s specs.Spec, opts *runhcsopts.Options) specs.Spec {
 		s.Annotations[annotations.NetworkConfigProxy] = opts.NCProxyAddr
 	}
 
+	if _, ok := s.Annotations[annotations.LCOWDevShmSizeInKb]; !ok && opts.DefaultContainerShmSizeInKb != 0 {
+		s.Annotations[annotations.LCOWDevShmSizeInKb] = strconv.FormatInt(int64(opts.DefaultContainerShmSizeInKb), 10)
+	}
+
 	return s
 }
diff --git a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
index fe11f8a2bb..13856085c6 100644
--- a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
+++ b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
@@ -10,6 +10,7 @@ import (
 	github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
 	io "io"
 	math "math"
+	math_bits "math/bits"
 	reflect "reflect"
 	strings "strings"
 	time "time"
@@ -25,7 +26,7 @@ var _ = time.Kitchen
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
 type Options_DebugType int32
 
@@ -139,10 +140,11 @@ type Options struct {
 	// log_level specifies the logrus log level for the shim. Supported values are a string representation of the
 	// logrus log levels: "trace", "debug", "info", "warn", "error", "fatal", "panic". This setting will override
 	// the `debug` field if both are specified, unless the level specified is also "debug", as these are equivalent.
-	LogLevel             string   `protobuf:"bytes,16,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	LogLevel                    string   `protobuf:"bytes,16,opt,name=log_level,json=logLevel,proto3" json:"log_level,omitempty"`
+	DefaultContainerShmSizeInKb int32    `protobuf:"varint,17,opt,name=default_container_shm_size_in_kb,json=defaultContainerShmSizeInKb,proto3" json:"default_container_shm_size_in_kb,omitempty"`
+	XXX_NoUnkeyedLiteral        struct{} `json:"-"`
+	XXX_unrecognized            []byte   `json:"-"`
+	XXX_sizecache               int32    `json:"-"`
 }
 
 func (m *Options) Reset()      { *m = Options{} }
@@ -158,7 +160,7 @@ func (m *Options) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
 		return xxx_messageInfo_Options.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
-		n, err := m.MarshalTo(b)
+		n, err := m.MarshalToSizedBuffer(b)
 		if err != nil {
 			return nil, err
 		}
@@ -207,7 +209,7 @@ func (m *ProcessDetails) XXX_Marshal(b []byte, deterministic bool) ([]byte, erro
 		return xxx_messageInfo_ProcessDetails.Marshal(b, m, deterministic)
 	} else {
 		b = b[:cap(b)]
-		n, err := m.MarshalTo(b)
+		n, err := m.MarshalToSizedBuffer(b)
 		if err != nil {
 			return nil, err
 		}
@@ -238,71 +240,73 @@ func init() {
 }
 
 var fileDescriptor_b643df6839c75082 = []byte{
-	// 920 bytes of a gzipped FileDescriptorProto
+	// 945 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x95, 0x5b, 0x6f, 0xdb, 0x36,
-	0x14, 0xc7, 0xad, 0x26, 0x71, 0xac, 0x93, 0x9b, 0xc3, 0x05, 0x98, 0x90, 0xac, 0xb6, 0x91, 0x0e,
-	0x68, 0x8a, 0x35, 0x52, 0xd2, 0x3d, 0x6e, 0xc0, 0xd0, 0xd8, 0x4e, 0xeb, 0x21, 0x17, 0x43, 0xce,
-	0xd2, 0x5d, 0x1e, 0x08, 0x5d, 0x18, 0x59, 0xa8, 0x28, 0x0a, 0x24, 0xed, 0xc5, 0x7d, 0xda, 0x47,
-	0xd8, 0xc7, 0xca, 0xe3, 0x1e, 0x07, 0x0c, 0xc8, 0x56, 0x7f, 0x88, 0x3d, 0x0f, 0xa4, 0xa8, 0xb4,
-	0x0b, 0x82, 0xbd, 0xec, 0xc9, 0xe4, 0xff, 0xfc, 0xf8, 0xe7, 0xe1, 0x21, 0x8f, 0x05, 0xe7, 0x49,
-	0x2a, 0xc7, 0x93, 0xd0, 0x8d, 0x18, 0xf5, 0x4e, 0xd3, 0x88, 0x33, 0xc1, 0xae, 0xa4, 0x37, 0x8e,
-	0x84, 0x18, 0xa7, 0xd4, 0x8b, 0x68, 0xec, 0x45, 0x2c, 0x97, 0x41, 0x9a, 0x13, 0x1e, 0xef, 0x2b,
-	0x6d, 0x9f, 0x4f, 0xf2, 0x71, 0x24, 0xf6, 0xa7, 0x87, 0x1e, 0x2b, 0x64, 0xca, 0x72, 0xe1, 0x95,
-	0x8a, 0x5b, 0x70, 0x26, 0x19, 0xda, 0xfa, 0xc0, 0xbb, 0x26, 0x30, 0x3d, 0xdc, 0xde, 0x4a, 0x58,
-	0xc2, 0x34, 0xe0, 0xa9, 0x51, 0xc9, 0x6e, 0xb7, 0x13, 0xc6, 0x92, 0x8c, 0x78, 0x7a, 0x16, 0x4e,
-	0xae, 0x3c, 0x99, 0x52, 0x22, 0x64, 0x40, 0x8b, 0x12, 0xd8, 0xfd, 0xbb, 0x0e, 0xcb, 0xe7, 0xe5,
-	0x2e, 0x68, 0x0b, 0x96, 0x62, 0x12, 0x4e, 0x12, 0xc7, 0xea, 0x58, 0x7b, 0x0d, 0xbf, 0x9c, 0xa0,
-	0x63, 0x00, 0x3d, 0xc0, 0x72, 0x56, 0x10, 0xe7, 0x51, 0xc7, 0xda, 0x5b, 0x7f, 0xf1, 0xd4, 0x7d,
-	0x28, 0x07, 0xd7, 0x18, 0xb9, 0x3d, 0xc5, 0x5f, 0xcc, 0x0a, 0xe2, 0xdb, 0x71, 0x35, 0x44, 0x4f,
-	0x60, 0x8d, 0x93, 0x24, 0x15, 0x92, 0xcf, 0x30, 0x67, 0x4c, 0x3a, 0x0b, 0x1d, 0x6b, 0xcf, 0xf6,
-	0x57, 0x2b, 0xd1, 0x67, 0x4c, 0x2a, 0x48, 0x04, 0x79, 0x1c, 0xb2, 0x6b, 0x9c, 0xd2, 0x20, 0x21,
-	0xce, 0x62, 0x09, 0x19, 0x71, 0xa0, 0x34, 0xf4, 0x0c, 0x9a, 0x15, 0x54, 0x64, 0x81, 0xbc, 0x62,
-	0x9c, 0x3a, 0x4b, 0x9a, 0xdb, 0x30, 0xfa, 0xd0, 0xc8, 0xe8, 0x27, 0xd8, 0xbc, 0xf3, 0x13, 0x2c,
-	0x0b, 0x54, 0x7e, 0x4e, 0x5d, 0x9f, 0xc1, 0xfd, 0xef, 0x33, 0x8c, 0xcc, 0x8e, 0xd5, 0x2a, 0xbf,
-	0xda, 0xf3, 0x4e, 0x41, 0x1e, 0x6c, 0x85, 0x8c, 0x49, 0x7c, 0x95, 0x66, 0x44, 0xe8, 0x33, 0xe1,
-	0x22, 0x90, 0x63, 0x67, 0x59, 0xe7, 0xb2, 0xa9, 0x62, 0xc7, 0x2a, 0xa4, 0x4e, 0x36, 0x0c, 0xe4,
-	0x18, 0x3d, 0x07, 0x34, 0xa5, 0xb8, 0xe0, 0x2c, 0x22, 0x42, 0x30, 0x8e, 0x23, 0x36, 0xc9, 0xa5,
-	0xd3, 0xe8, 0x58, 0x7b, 0x4b, 0x7e, 0x73, 0x4a, 0x87, 0x55, 0xa0, 0xab, 0x74, 0xe4, 0xc2, 0xd6,
-	0x94, 0x62, 0x4a, 0x28, 0xe3, 0x33, 0x2c, 0xd2, 0x77, 0x04, 0xa7, 0x39, 0xa6, 0xa1, 0x63, 0x57,
-	0xfc, 0xa9, 0x0e, 0x8d, 0xd2, 0x77, 0x64, 0x90, 0x9f, 0x86, 0xa8, 0x05, 0xf0, 0x6a, 0xf8, 0xdd,
-	0xe5, 0xeb, 0x9e, 0xda, 0xcb, 0x01, 0x9d, 0xc4, 0x47, 0x0a, 0xfa, 0x1a, 0x76, 0x44, 0x14, 0x64,
-	0x04, 0x47, 0xc5, 0x04, 0x67, 0x29, 0x4d, 0xa5, 0xc0, 0x92, 0x61, 0x73, 0x2c, 0x67, 0x45, 0x5f,
-	0xfa, 0xa7, 0x1a, 0xe9, 0x16, 0x93, 0x13, 0x0d, 0x5c, 0x30, 0x53, 0x07, 0x74, 0x0a, 0x9f, 0xc7,
-	0xe4, 0x2a, 0x98, 0x64, 0x12, 0xdf, 0xd5, 0x0d, 0x8b, 0x88, 0x07, 0x32, 0x1a, 0xdf, 0x65, 0x97,
-	0x84, 0xce, 0xaa, 0xce, 0xae, 0x6d, 0xd8, 0x6e, 0x85, 0x8e, 0x4a, 0xb2, 0x4c, 0xf6, 0x55, 0x88,
-	0xbe, 0x81, 0xc7, 0x95, 0xdd, 0x94, 0x3e, 0xe4, 0xb3, 0xa6, 0x7d, 0x1c, 0x03, 0x5d, 0xd2, 0xfb,
-	0x06, 0xea, 0xa5, 0x8c, 0x03, 0x4e, 0xaa, 0xb5, 0xce, 0xba, 0xce, 0x7f, 0x55, 0x8b, 0x06, 0x46,
-	0x1d, 0x58, 0x39, 0xeb, 0x0e, 0x39, 0xbb, 0x9e, 0xbd, 0x8c, 0x63, 0xee, 0x6c, 0xe8, 0x9a, 0x7c,
-	0x2c, 0xa1, 0x1d, 0xb0, 0x33, 0x96, 0xe0, 0x8c, 0x4c, 0x49, 0xe6, 0x34, 0x75, 0xbc, 0x91, 0xb1,
-	0xe4, 0x44, 0xcd, 0x77, 0x9f, 0x81, 0x7d, 0xf7, 0x94, 0x91, 0x0d, 0x4b, 0x67, 0xc3, 0xc1, 0xb0,
-	0xdf, 0xac, 0xa1, 0x06, 0x2c, 0x1e, 0x0f, 0x4e, 0xfa, 0x4d, 0x0b, 0x2d, 0xc3, 0x42, 0xff, 0xe2,
-	0x4d, 0xf3, 0xd1, 0xae, 0x07, 0xcd, 0xfb, 0x2f, 0x06, 0xad, 0xc0, 0xf2, 0xd0, 0x3f, 0xef, 0xf6,
-	0x47, 0xa3, 0x66, 0x0d, 0xad, 0x03, 0xbc, 0xfe, 0x61, 0xd8, 0xf7, 0x2f, 0x07, 0xa3, 0x73, 0xbf,
-	0x69, 0xed, 0xfe, 0xb1, 0x00, 0xeb, 0xe6, 0xc2, 0x7b, 0x44, 0x06, 0x69, 0x26, 0xd0, 0x63, 0x00,
-	0xfd, 0xe8, 0x71, 0x1e, 0x50, 0xa2, 0x9b, 0xd0, 0xf6, 0x6d, 0xad, 0x9c, 0x05, 0x94, 0xa0, 0x2e,
-	0x40, 0xc4, 0x49, 0x20, 0x49, 0x8c, 0x03, 0xa9, 0x1b, 0x71, 0xe5, 0xc5, 0xb6, 0x5b, 0x36, 0xb8,
-	0x5b, 0x35, 0xb8, 0x7b, 0x51, 0x35, 0xf8, 0x51, 0xe3, 0xe6, 0xb6, 0x5d, 0xfb, 0xf5, 0xcf, 0xb6,
-	0xe5, 0xdb, 0x66, 0xdd, 0x4b, 0x89, 0xbe, 0x00, 0xf4, 0x96, 0xf0, 0x9c, 0x64, 0x58, 0xfd, 0x13,
-	0xe0, 0xc3, 0x83, 0x03, 0x9c, 0x0b, 0xdd, 0x8a, 0x8b, 0xfe, 0x46, 0x19, 0x51, 0x0e, 0x87, 0x07,
-	0x07, 0x67, 0x02, 0xb9, 0xf0, 0x89, 0x79, 0x7e, 0x11, 0xa3, 0x34, 0x95, 0x38, 0x9c, 0x49, 0x22,
-	0x74, 0x4f, 0x2e, 0xfa, 0x9b, 0x65, 0xa8, 0xab, 0x23, 0x47, 0x2a, 0x80, 0x8e, 0xa1, 0x63, 0xf8,
-	0x9f, 0x19, 0x7f, 0x9b, 0xe6, 0x09, 0x16, 0x44, 0xe2, 0x82, 0xa7, 0xd3, 0x40, 0x12, 0xb3, 0x78,
-	0x49, 0x2f, 0xfe, 0xac, 0xe4, 0xde, 0x94, 0xd8, 0x88, 0xc8, 0x61, 0x09, 0x95, 0x3e, 0x3d, 0x68,
-	0x3f, 0xe0, 0xa3, 0x6f, 0x36, 0x36, 0x36, 0x75, 0x6d, 0xb3, 0x73, 0xdf, 0x66, 0xa4, 0x99, 0xd2,
-	0xe5, 0x39, 0x80, 0x69, 0x35, 0x9c, 0xc6, 0xba, 0x29, 0xd7, 0x8e, 0xd6, 0xe6, 0xb7, 0x6d, 0xdb,
-	0x94, 0x7d, 0xd0, 0xf3, 0x6d, 0x03, 0x0c, 0x62, 0xf4, 0x14, 0x9a, 0x13, 0x41, 0xf8, 0xbf, 0xca,
-	0xd2, 0xd0, 0x9b, 0xac, 0x29, 0xfd, 0x43, 0x51, 0x9e, 0xc0, 0x32, 0xb9, 0x26, 0x91, 0xf2, 0x54,
-	0x9d, 0x68, 0x1f, 0xc1, 0xfc, 0xb6, 0x5d, 0xef, 0x5f, 0x93, 0x68, 0xd0, 0xf3, 0xeb, 0x2a, 0x34,
-	0x88, 0x8f, 0xe2, 0x9b, 0xf7, 0xad, 0xda, 0xef, 0xef, 0x5b, 0xb5, 0x5f, 0xe6, 0x2d, 0xeb, 0x66,
-	0xde, 0xb2, 0x7e, 0x9b, 0xb7, 0xac, 0xbf, 0xe6, 0x2d, 0xeb, 0xc7, 0x6f, 0xff, 0xff, 0xe7, 0xe0,
-	0x2b, 0xf3, 0xfb, 0x7d, 0x2d, 0xac, 0xeb, 0x7b, 0xff, 0xf2, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x84, 0x30, 0x9b, 0x7c, 0x65, 0x06, 0x00, 0x00,
+	0x14, 0xc7, 0xad, 0xe6, 0x62, 0xeb, 0xe4, 0xe6, 0x70, 0x01, 0x26, 0x24, 0xab, 0x6d, 0xa4, 0x03,
+	0x9a, 0x62, 0x8d, 0x94, 0x74, 0x8f, 0x1b, 0x30, 0x34, 0xb6, 0xd3, 0x7a, 0xcb, 0xc5, 0x90, 0xb3,
+	0x74, 0x97, 0x07, 0x42, 0x17, 0x46, 0x12, 0x22, 0x8a, 0x82, 0x48, 0x7b, 0x71, 0x9f, 0xf6, 0x11,
+	0xf6, 0x85, 0xf6, 0x9e, 0xc7, 0x3d, 0x0e, 0x18, 0x90, 0xad, 0xfe, 0x24, 0x03, 0x29, 0xca, 0xed,
+	0xb2, 0x60, 0x2f, 0x7b, 0xb2, 0xf4, 0x3f, 0x3f, 0xfe, 0x79, 0xce, 0x11, 0x0f, 0x0d, 0xe7, 0x51,
+	0x22, 0xe2, 0xb1, 0x6f, 0x07, 0x8c, 0x3a, 0xa7, 0x49, 0x50, 0x30, 0xce, 0xae, 0x84, 0x13, 0x07,
+	0x9c, 0xc7, 0x09, 0x75, 0x02, 0x1a, 0x3a, 0x01, 0xcb, 0x84, 0x97, 0x64, 0xa4, 0x08, 0xf7, 0xa5,
+	0xb6, 0x5f, 0x8c, 0xb3, 0x38, 0xe0, 0xfb, 0x93, 0x43, 0x87, 0xe5, 0x22, 0x61, 0x19, 0x77, 0x4a,
+	0xc5, 0xce, 0x0b, 0x26, 0x18, 0xda, 0x7a, 0xcf, 0xdb, 0x3a, 0x30, 0x39, 0xdc, 0xde, 0x8a, 0x58,
+	0xc4, 0x14, 0xe0, 0xc8, 0xa7, 0x92, 0xdd, 0x6e, 0x47, 0x8c, 0x45, 0x29, 0x71, 0xd4, 0x9b, 0x3f,
+	0xbe, 0x72, 0x44, 0x42, 0x09, 0x17, 0x1e, 0xcd, 0x4b, 0x60, 0xf7, 0xd7, 0x3a, 0xd4, 0xcf, 0xcb,
+	0x5d, 0xd0, 0x16, 0x2c, 0x85, 0xc4, 0x1f, 0x47, 0x96, 0xd1, 0x31, 0xf6, 0x1a, 0x6e, 0xf9, 0x82,
+	0x8e, 0x01, 0xd4, 0x03, 0x16, 0xd3, 0x9c, 0x58, 0x8f, 0x3a, 0xc6, 0xde, 0xfa, 0x8b, 0xa7, 0xf6,
+	0x43, 0x39, 0xd8, 0xda, 0xc8, 0xee, 0x49, 0xfe, 0x62, 0x9a, 0x13, 0xd7, 0x0c, 0xab, 0x47, 0xf4,
+	0x04, 0xd6, 0x0a, 0x12, 0x25, 0x5c, 0x14, 0x53, 0x5c, 0x30, 0x26, 0xac, 0x85, 0x8e, 0xb1, 0x67,
+	0xba, 0xab, 0x95, 0xe8, 0x32, 0x26, 0x24, 0xc4, 0xbd, 0x2c, 0xf4, 0xd9, 0x0d, 0x4e, 0xa8, 0x17,
+	0x11, 0x6b, 0xb1, 0x84, 0xb4, 0x38, 0x90, 0x1a, 0x7a, 0x06, 0xcd, 0x0a, 0xca, 0x53, 0x4f, 0x5c,
+	0xb1, 0x82, 0x5a, 0x4b, 0x8a, 0xdb, 0xd0, 0xfa, 0x50, 0xcb, 0xe8, 0x47, 0xd8, 0x9c, 0xfb, 0x71,
+	0x96, 0x7a, 0x32, 0x3f, 0x6b, 0x59, 0xd5, 0x60, 0xff, 0x77, 0x0d, 0x23, 0xbd, 0x63, 0xb5, 0xca,
+	0xad, 0xf6, 0x9c, 0x2b, 0xc8, 0x81, 0x2d, 0x9f, 0x31, 0x81, 0xaf, 0x92, 0x94, 0x70, 0x55, 0x13,
+	0xce, 0x3d, 0x11, 0x5b, 0x75, 0x95, 0xcb, 0xa6, 0x8c, 0x1d, 0xcb, 0x90, 0xac, 0x6c, 0xe8, 0x89,
+	0x18, 0x3d, 0x07, 0x34, 0xa1, 0x38, 0x2f, 0x58, 0x40, 0x38, 0x67, 0x05, 0x0e, 0xd8, 0x38, 0x13,
+	0x56, 0xa3, 0x63, 0xec, 0x2d, 0xb9, 0xcd, 0x09, 0x1d, 0x56, 0x81, 0xae, 0xd4, 0x91, 0x0d, 0x5b,
+	0x13, 0x8a, 0x29, 0xa1, 0xac, 0x98, 0x62, 0x9e, 0xbc, 0x25, 0x38, 0xc9, 0x30, 0xf5, 0x2d, 0xb3,
+	0xe2, 0x4f, 0x55, 0x68, 0x94, 0xbc, 0x25, 0x83, 0xec, 0xd4, 0x47, 0x2d, 0x80, 0x57, 0xc3, 0x6f,
+	0x2f, 0x5f, 0xf7, 0xe4, 0x5e, 0x16, 0xa8, 0x24, 0x3e, 0x50, 0xd0, 0x97, 0xb0, 0xc3, 0x03, 0x2f,
+	0x25, 0x38, 0xc8, 0xc7, 0x38, 0x4d, 0x68, 0x22, 0x38, 0x16, 0x0c, 0xeb, 0xb2, 0xac, 0x15, 0xf5,
+	0xd1, 0x3f, 0x56, 0x48, 0x37, 0x1f, 0x9f, 0x28, 0xe0, 0x82, 0xe9, 0x3e, 0xa0, 0x53, 0xf8, 0x34,
+	0x24, 0x57, 0xde, 0x38, 0x15, 0x78, 0xde, 0x37, 0xcc, 0x83, 0xc2, 0x13, 0x41, 0x3c, 0xcf, 0x2e,
+	0xf2, 0xad, 0x55, 0x95, 0x5d, 0x5b, 0xb3, 0xdd, 0x0a, 0x1d, 0x95, 0x64, 0x99, 0xec, 0x2b, 0x1f,
+	0x7d, 0x05, 0x8f, 0x2b, 0xbb, 0x09, 0x7d, 0xc8, 0x67, 0x4d, 0xf9, 0x58, 0x1a, 0xba, 0xa4, 0xf7,
+	0x0d, 0xe4, 0x49, 0x89, 0xbd, 0x82, 0x54, 0x6b, 0xad, 0x75, 0x95, 0xff, 0xaa, 0x12, 0x35, 0x8c,
+	0x3a, 0xb0, 0x72, 0xd6, 0x1d, 0x16, 0xec, 0x66, 0xfa, 0x32, 0x0c, 0x0b, 0x6b, 0x43, 0xf5, 0xe4,
+	0x43, 0x09, 0xed, 0x80, 0x99, 0xb2, 0x08, 0xa7, 0x64, 0x42, 0x52, 0xab, 0xa9, 0xe2, 0x8d, 0x94,
+	0x45, 0x27, 0xf2, 0x1d, 0xf5, 0xa1, 0xf3, 0x40, 0xcd, 0x31, 0x9d, 0xe7, 0x79, 0xed, 0x5b, 0x9b,
+	0x2a, 0xcf, 0x9d, 0x7f, 0xd5, 0x1b, 0xd3, 0x32, 0xd5, 0x6f, 0xfc, 0xdd, 0x67, 0x60, 0xce, 0x27,
+	0x02, 0x99, 0xb0, 0x74, 0x36, 0x1c, 0x0c, 0xfb, 0xcd, 0x1a, 0x6a, 0xc0, 0xe2, 0xf1, 0xe0, 0xa4,
+	0xdf, 0x34, 0x50, 0x1d, 0x16, 0xfa, 0x17, 0x6f, 0x9a, 0x8f, 0x76, 0x1d, 0x68, 0xde, 0x3f, 0x78,
+	0x68, 0x05, 0xea, 0x43, 0xf7, 0xbc, 0xdb, 0x1f, 0x8d, 0x9a, 0x35, 0xb4, 0x0e, 0xf0, 0xfa, 0xfb,
+	0x61, 0xdf, 0xbd, 0x1c, 0x8c, 0xce, 0xdd, 0xa6, 0xb1, 0xfb, 0xc7, 0x02, 0xac, 0xeb, 0x73, 0xd3,
+	0x23, 0xc2, 0x4b, 0x52, 0x8e, 0x1e, 0x03, 0xa8, 0xd9, 0xc1, 0x99, 0x47, 0x89, 0x9a, 0x65, 0xd3,
+	0x35, 0x95, 0x72, 0xe6, 0x51, 0x82, 0xba, 0x00, 0x41, 0x41, 0x3c, 0x41, 0x42, 0xec, 0x09, 0x35,
+	0xcf, 0x2b, 0x2f, 0xb6, 0xed, 0xf2, 0x9e, 0xb0, 0xab, 0x7b, 0xc2, 0xbe, 0xa8, 0xee, 0x89, 0xa3,
+	0xc6, 0xed, 0x5d, 0xbb, 0xf6, 0xcb, 0x9f, 0x6d, 0xc3, 0x35, 0xf5, 0xba, 0x97, 0x02, 0x7d, 0x06,
+	0xe8, 0x9a, 0x14, 0x19, 0x49, 0xb1, 0xbc, 0x50, 0xf0, 0xe1, 0xc1, 0x01, 0xce, 0xb8, 0x9a, 0xe8,
+	0x45, 0x77, 0xa3, 0x8c, 0x48, 0x87, 0xc3, 0x83, 0x83, 0x33, 0x8e, 0x6c, 0xf8, 0x48, 0x9f, 0xe2,
+	0x80, 0x51, 0x9a, 0x08, 0xec, 0x4f, 0x05, 0xe1, 0x6a, 0xb4, 0x17, 0xdd, 0xcd, 0x32, 0xd4, 0x55,
+	0x91, 0x23, 0x19, 0x40, 0xc7, 0xd0, 0xd1, 0xfc, 0x4f, 0xac, 0xb8, 0x4e, 0xb2, 0x08, 0x73, 0x22,
+	0x70, 0x5e, 0x24, 0x13, 0x4f, 0x10, 0xbd, 0x78, 0x49, 0x2d, 0xfe, 0xa4, 0xe4, 0xde, 0x94, 0xd8,
+	0x88, 0x88, 0x61, 0x09, 0x95, 0x3e, 0x3d, 0x68, 0x3f, 0xe0, 0xa3, 0x0e, 0x48, 0xa8, 0x6d, 0x96,
+	0x95, 0xcd, 0xce, 0x7d, 0x9b, 0x91, 0x62, 0x4a, 0x97, 0xe7, 0x00, 0x7a, 0x62, 0x71, 0x12, 0xaa,
+	0xd9, 0x5e, 0x3b, 0x5a, 0x9b, 0xdd, 0xb5, 0x4d, 0xdd, 0xf6, 0x41, 0xcf, 0x35, 0x35, 0x30, 0x08,
+	0xd1, 0x53, 0x68, 0x8e, 0x39, 0x29, 0xfe, 0xd1, 0x96, 0x86, 0xda, 0x64, 0x4d, 0xea, 0xef, 0x9b,
+	0xf2, 0x04, 0xea, 0xe4, 0x86, 0x04, 0xd2, 0x53, 0x0e, 0xb4, 0x79, 0x04, 0xb3, 0xbb, 0xf6, 0x72,
+	0xff, 0x86, 0x04, 0x83, 0x9e, 0xbb, 0x2c, 0x43, 0x83, 0xf0, 0x28, 0xbc, 0x7d, 0xd7, 0xaa, 0xfd,
+	0xfe, 0xae, 0x55, 0xfb, 0x79, 0xd6, 0x32, 0x6e, 0x67, 0x2d, 0xe3, 0xb7, 0x59, 0xcb, 0xf8, 0x6b,
+	0xd6, 0x32, 0x7e, 0xf8, 0xfa, 0xff, 0xff, 0xab, 0x7c, 0xa1, 0x7f, 0xbf, 0xab, 0xf9, 0xcb, 0xea,
+	0xbb, 0x7f, 0xfe, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x88, 0xa9, 0x17, 0x5b, 0xac, 0x06, 0x00,
+	0x00,
 }
 
 func (m *Options) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
 	if err != nil {
 		return nil, err
 	}
@@ -310,124 +314,144 @@ func (m *Options) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *Options) MarshalTo(dAtA []byte) (int, error) {
-	var i int
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *Options) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	if m.Debug {
-		dAtA[i] = 0x8
-		i++
-		if m.Debug {
+	if m.XXX_unrecognized != nil {
+		i -= len(m.XXX_unrecognized)
+		copy(dAtA[i:], m.XXX_unrecognized)
+	}
+	if m.DefaultContainerShmSizeInKb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerShmSizeInKb))
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0x88
+	}
+	if len(m.LogLevel) > 0 {
+		i -= len(m.LogLevel)
+		copy(dAtA[i:], m.LogLevel)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel)))
+		i--
+		dAtA[i] = 0x1
+		i--
+		dAtA[i] = 0x82
+	}
+	if len(m.NCProxyAddr) > 0 {
+		i -= len(m.NCProxyAddr)
+		copy(dAtA[i:], m.NCProxyAddr)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr)))
+		i--
+		dAtA[i] = 0x7a
+	}
+	if m.ShareScratch {
+		i--
+		if m.ShareScratch {
 			dAtA[i] = 1
 		} else {
 			dAtA[i] = 0
 		}
-		i++
-	}
-	if m.DebugType != 0 {
-		dAtA[i] = 0x10
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType))
+		i--
+		dAtA[i] = 0x70
 	}
-	if len(m.RegistryRoot) > 0 {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot)))
-		i += copy(dAtA[i:], m.RegistryRoot)
+	if m.DefaultVmScratchSizeInGb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb))
+		i--
+		dAtA[i] = 0x68
 	}
-	if len(m.SandboxImage) > 0 {
-		dAtA[i] = 0x22
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage)))
-		i += copy(dAtA[i:], m.SandboxImage)
+	if m.DefaultContainerScratchSizeInGb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb))
+		i--
+		dAtA[i] = 0x60
 	}
-	if len(m.SandboxPlatform) > 0 {
-		dAtA[i] = 0x2a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform)))
-		i += copy(dAtA[i:], m.SandboxPlatform)
+	if m.ScaleCpuLimitsToSandbox {
+		i--
+		if m.ScaleCpuLimitsToSandbox {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i--
+		dAtA[i] = 0x58
 	}
-	if m.SandboxIsolation != 0 {
-		dAtA[i] = 0x30
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation))
+	if len(m.GPUVHDPath) > 0 {
+		i -= len(m.GPUVHDPath)
+		copy(dAtA[i:], m.GPUVHDPath)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath)))
+		i--
+		dAtA[i] = 0x52
 	}
-	if len(m.BootFilesRootPath) > 0 {
-		dAtA[i] = 0x3a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath)))
-		i += copy(dAtA[i:], m.BootFilesRootPath)
+	if m.VmMemorySizeInMb != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb))
+		i--
+		dAtA[i] = 0x48
 	}
 	if m.VmProcessorCount != 0 {
-		dAtA[i] = 0x40
-		i++
 		i = encodeVarintRunhcs(dAtA, i, uint64(m.VmProcessorCount))
+		i--
+		dAtA[i] = 0x40
 	}
-	if m.VmMemorySizeInMb != 0 {
-		dAtA[i] = 0x48
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.VmMemorySizeInMb))
+	if len(m.BootFilesRootPath) > 0 {
+		i -= len(m.BootFilesRootPath)
+		copy(dAtA[i:], m.BootFilesRootPath)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.BootFilesRootPath)))
+		i--
+		dAtA[i] = 0x3a
 	}
-	if len(m.GPUVHDPath) > 0 {
-		dAtA[i] = 0x52
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.GPUVHDPath)))
-		i += copy(dAtA[i:], m.GPUVHDPath)
+	if m.SandboxIsolation != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.SandboxIsolation))
+		i--
+		dAtA[i] = 0x30
 	}
-	if m.ScaleCpuLimitsToSandbox {
-		dAtA[i] = 0x58
-		i++
-		if m.ScaleCpuLimitsToSandbox {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
+	if len(m.SandboxPlatform) > 0 {
+		i -= len(m.SandboxPlatform)
+		copy(dAtA[i:], m.SandboxPlatform)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxPlatform)))
+		i--
+		dAtA[i] = 0x2a
 	}
-	if m.DefaultContainerScratchSizeInGb != 0 {
-		dAtA[i] = 0x60
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultContainerScratchSizeInGb))
+	if len(m.SandboxImage) > 0 {
+		i -= len(m.SandboxImage)
+		copy(dAtA[i:], m.SandboxImage)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.SandboxImage)))
+		i--
+		dAtA[i] = 0x22
 	}
-	if m.DefaultVmScratchSizeInGb != 0 {
-		dAtA[i] = 0x68
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.DefaultVmScratchSizeInGb))
+	if len(m.RegistryRoot) > 0 {
+		i -= len(m.RegistryRoot)
+		copy(dAtA[i:], m.RegistryRoot)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.RegistryRoot)))
+		i--
+		dAtA[i] = 0x1a
 	}
-	if m.ShareScratch {
-		dAtA[i] = 0x70
-		i++
-		if m.ShareScratch {
+	if m.DebugType != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.DebugType))
+		i--
+		dAtA[i] = 0x10
+	}
+	if m.Debug {
+		i--
+		if m.Debug {
 			dAtA[i] = 1
 		} else {
 			dAtA[i] = 0
 		}
-		i++
-	}
-	if len(m.NCProxyAddr) > 0 {
-		dAtA[i] = 0x7a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.NCProxyAddr)))
-		i += copy(dAtA[i:], m.NCProxyAddr)
-	}
-	if len(m.LogLevel) > 0 {
-		dAtA[i] = 0x82
-		i++
-		dAtA[i] = 0x1
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.LogLevel)))
-		i += copy(dAtA[i:], m.LogLevel)
-	}
-	if m.XXX_unrecognized != nil {
-		i += copy(dAtA[i:], m.XXX_unrecognized)
+		i--
+		dAtA[i] = 0x8
 	}
-	return i, nil
+	return len(dAtA) - i, nil
 }
 
 func (m *ProcessDetails) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
 	if err != nil {
 		return nil, err
 	}
@@ -435,74 +459,84 @@ func (m *ProcessDetails) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *ProcessDetails) MarshalTo(dAtA []byte) (int, error) {
-	var i int
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ProcessDetails) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	if len(m.ImageName) > 0 {
-		dAtA[i] = 0xa
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName)))
-		i += copy(dAtA[i:], m.ImageName)
-	}
-	dAtA[i] = 0x12
-	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
+	if m.XXX_unrecognized != nil {
+		i -= len(m.XXX_unrecognized)
+		copy(dAtA[i:], m.XXX_unrecognized)
 	}
-	i += n1
-	if m.KernelTime_100Ns != 0 {
-		dAtA[i] = 0x18
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns))
+	if len(m.ExecID) > 0 {
+		i -= len(m.ExecID)
+		copy(dAtA[i:], m.ExecID)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID)))
+		i--
+		dAtA[i] = 0x4a
 	}
-	if m.MemoryCommitBytes != 0 {
-		dAtA[i] = 0x20
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes))
+	if m.UserTime_100Ns != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns))
+		i--
+		dAtA[i] = 0x40
 	}
-	if m.MemoryWorkingSetPrivateBytes != 0 {
-		dAtA[i] = 0x28
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes))
+	if m.ProcessID != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID))
+		i--
+		dAtA[i] = 0x38
 	}
 	if m.MemoryWorkingSetSharedBytes != 0 {
-		dAtA[i] = 0x30
-		i++
 		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetSharedBytes))
+		i--
+		dAtA[i] = 0x30
 	}
-	if m.ProcessID != 0 {
-		dAtA[i] = 0x38
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.ProcessID))
+	if m.MemoryWorkingSetPrivateBytes != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryWorkingSetPrivateBytes))
+		i--
+		dAtA[i] = 0x28
 	}
-	if m.UserTime_100Ns != 0 {
-		dAtA[i] = 0x40
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(m.UserTime_100Ns))
+	if m.MemoryCommitBytes != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.MemoryCommitBytes))
+		i--
+		dAtA[i] = 0x20
 	}
-	if len(m.ExecID) > 0 {
-		dAtA[i] = 0x4a
-		i++
-		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ExecID)))
-		i += copy(dAtA[i:], m.ExecID)
+	if m.KernelTime_100Ns != 0 {
+		i = encodeVarintRunhcs(dAtA, i, uint64(m.KernelTime_100Ns))
+		i--
+		dAtA[i] = 0x18
 	}
-	if m.XXX_unrecognized != nil {
-		i += copy(dAtA[i:], m.XXX_unrecognized)
+	n1, err1 := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt):])
+	if err1 != nil {
+		return 0, err1
 	}
-	return i, nil
+	i -= n1
+	i = encodeVarintRunhcs(dAtA, i, uint64(n1))
+	i--
+	dAtA[i] = 0x12
+	if len(m.ImageName) > 0 {
+		i -= len(m.ImageName)
+		copy(dAtA[i:], m.ImageName)
+		i = encodeVarintRunhcs(dAtA, i, uint64(len(m.ImageName)))
+		i--
+		dAtA[i] = 0xa
+	}
+	return len(dAtA) - i, nil
 }
 
 func encodeVarintRunhcs(dAtA []byte, offset int, v uint64) int {
+	offset -= sovRunhcs(v)
+	base := offset
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
 		v >>= 7
 		offset++
 	}
 	dAtA[offset] = uint8(v)
-	return offset + 1
+	return base
 }
 func (m *Options) Size() (n int) {
 	if m == nil {
@@ -565,6 +599,9 @@ func (m *Options) Size() (n int) {
 	if l > 0 {
 		n += 2 + l + sovRunhcs(uint64(l))
 	}
+	if m.DefaultContainerShmSizeInKb != 0 {
+		n += 2 + sovRunhcs(uint64(m.DefaultContainerShmSizeInKb))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -612,14 +649,7 @@ func (m *ProcessDetails) Size() (n int) {
 }
 
 func sovRunhcs(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
+	return (math_bits.Len64(x|1) + 6) / 7
 }
 func sozRunhcs(x uint64) (n int) {
 	return sovRunhcs(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -645,6 +675,7 @@ func (this *Options) String() string {
 		`ShareScratch:` + fmt.Sprintf("%v", this.ShareScratch) + `,`,
 		`NCProxyAddr:` + fmt.Sprintf("%v", this.NCProxyAddr) + `,`,
 		`LogLevel:` + fmt.Sprintf("%v", this.LogLevel) + `,`,
+		`DefaultContainerShmSizeInKb:` + fmt.Sprintf("%v", this.DefaultContainerShmSizeInKb) + `,`,
 		`XXX_unrecognized:` + fmt.Sprintf("%v", this.XXX_unrecognized) + `,`,
 		`}`,
 	}, "")
@@ -656,7 +687,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", "types.Timestamp", 1), `&`, ``, 1) + `,`,
+		`CreatedAt:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.CreatedAt), "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) + `,`,
@@ -1104,16 +1135,32 @@ func (m *Options) Unmarshal(dAtA []byte) error {
 			}
 			m.LogLevel = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
+		case 17:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field DefaultContainerShmSizeInKb", wireType)
+			}
+			m.DefaultContainerShmSizeInKb = 0
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRunhcs
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				m.DefaultContainerShmSizeInKb |= int32(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
 		default:
 			iNdEx = preIndex
 			skippy, err := skipRunhcs(dAtA[iNdEx:])
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRunhcs
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRunhcs
 			}
 			if (iNdEx + skippy) > l {
@@ -1375,10 +1422,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
-				return ErrInvalidLengthRunhcs
-			}
-			if (iNdEx + skippy) < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthRunhcs
 			}
 			if (iNdEx + skippy) > l {
@@ -1397,6 +1441,7 @@ func (m *ProcessDetails) Unmarshal(dAtA []byte) error {
 func skipRunhcs(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
+	depth := 0
 	for iNdEx < l {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
@@ -1428,10 +1473,8 @@ func skipRunhcs(dAtA []byte) (n int, err error) {
 					break
 				}
 			}
-			return iNdEx, nil
 		case 1:
 			iNdEx += 8
-			return iNdEx, nil
 		case 2:
 			var length int
 			for shift := uint(0); ; shift += 7 {
@@ -1452,55 +1495,30 @@ func skipRunhcs(dAtA []byte) (n int, err error) {
 				return 0, ErrInvalidLengthRunhcs
 			}
 			iNdEx += length
-			if iNdEx < 0 {
-				return 0, ErrInvalidLengthRunhcs
-			}
-			return iNdEx, nil
 		case 3:
-			for {
-				var innerWire uint64
-				var start int = iNdEx
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return 0, ErrIntOverflowRunhcs
-					}
-					if iNdEx >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := skipRunhcs(dAtA[start:])
-				if err != nil {
-					return 0, err
-				}
-				iNdEx = start + next
-				if iNdEx < 0 {
-					return 0, ErrInvalidLengthRunhcs
-				}
-			}
-			return iNdEx, nil
+			depth++
 		case 4:
-			return iNdEx, nil
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupRunhcs
+			}
+			depth--
 		case 5:
 			iNdEx += 4
-			return iNdEx, nil
 		default:
 			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
 		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthRunhcs
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
 	}
-	panic("unreachable")
+	return 0, io.ErrUnexpectedEOF
 }
 
 var (
-	ErrInvalidLengthRunhcs = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowRunhcs   = fmt.Errorf("proto: integer overflow")
+	ErrInvalidLengthRunhcs        = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrIntOverflowRunhcs          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupRunhcs = fmt.Errorf("proto: unexpected end of group")
 )
diff --git a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto
index 90f3376ffc..cabd83d960 100644
--- a/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto
+++ b/test/vendor/github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto
@@ -93,6 +93,8 @@ message Options {
 	// logrus log levels: "trace", "debug", "info", "warn", "error", "fatal", "panic". This setting will override
 	// the `debug` field if both are specified, unless the level specified is also "debug", as these are equivalent.
 	string log_level = 16;
+
+	int32 default_container_shm_size_in_kb = 17;
 }
 
 // ProcessDetails contains additional information about a process. This is the additional
diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go b/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go
index fcf41fba08..d8d3943092 100644
--- a/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go
+++ b/test/vendor/github.com/Microsoft/hcsshim/internal/oci/uvm.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/Microsoft/hcsshim/pkg/annotations"
 	"strconv"
 	"strings"
 
@@ -13,6 +12,7 @@ import (
 	"github.com/Microsoft/hcsshim/internal/log"
 	"github.com/Microsoft/hcsshim/internal/logfields"
 	"github.com/Microsoft/hcsshim/internal/uvm"
+	"github.com/Microsoft/hcsshim/pkg/annotations"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 )
@@ -395,5 +395,9 @@ func UpdateSpecFromOptions(s specs.Spec, opts *runhcsopts.Options) specs.Spec {
 		s.Annotations[annotations.NetworkConfigProxy] = opts.NCProxyAddr
 	}
 
+	if _, ok := s.Annotations[annotations.LCOWDevShmSizeInKb]; !ok && opts.DefaultContainerShmSizeInKb != 0 {
+		s.Annotations[annotations.LCOWDevShmSizeInKb] = strconv.FormatInt(int64(opts.DefaultContainerShmSizeInKb), 10)
+	}
+
 	return s
 }