gradle update
Merge branch 'hotfix/gradle_upgrade'