Jira to Main
Added Spark support