Merge branch 'feature/tboxreasoner-improved' into develop