Commented out user synonyms stuff because untestable
Release 1.9.0