Add definitions db fields conditionally (remove definitions dependency)
Merge branch '3.0'