master branch is ok again, ignore the other branch, fixed bad commits and merged xin's work into queueunderflowtest