applied patch
fix last test fails
fix term index test
remove condition
applied interdiff
fix create field instance
small fixes
fix import