This brings in latest changes from the branches fix_failing_unit_tests and warehousing.
fix_failing_unit_tests
warehousing