skip tests, removed unused tables, removed unused test
Merge branch '4.6'