merge in changes for checkInset