removed xcbkptlist
merge