Merged all changes from develop
Fix jenkins build errors due to version bump