Tom Tresansky

@bot-gradle test this

@bot-gradle test this

@bot-gradle test and merge

I think this is ready to merge now.

Awaiting 7.6 for https://github.com/gradle/gradle/pull/21607/files to make it to `master`, then can proceed to finish this one.

@bot-gradle test this

@bot-gradle test this

@big-guy - I think this one is ready to merge now.

@bot-gradle test this

@bot-gradle test and merge