merge xtabs feature branch