Merge tag '2.0.7' into develop

Version 2.0.7
Use new sorting field syntax.
Fix CTO-104, restore basic entities.
Merge branch 'release/2.0.8'