QA package from River-2.2