Merge "isReservedSupported=true when running as container"