Fixed broken dependency
Fixed broken dependency
Removing compilation errors
Removing deprecated class reference
Merge branch 'develop' into feature/sparksql-integration