Merge "Fixed READ_LOCKING bitfield check"