Merge "Add UNINITIALIZED and rename INVALID"