Merge new changes in with trexRecon repository (not committed to CVS yet)