(refs #254)Remove AUTO_SERVER=TRUE for performance issue.
Merge from upstream