gradle/gradle#20210 gradle/gradle#24820 (cherry picked from commit 8a1625ec7906a3f396d0f217cd8c168f539b5167)