Merge of Gradle port