Merge "Fix the Jar vulnerability and licensing"