2014-12-24: add to merge for committing
2014-12-24: add to merge for committing
2014-12-24: change rerate test query