Align logic for functional test kits#1122

Goooler merged 16 commits intomainGradleUp/shadow:mainfrom

g/20241229/tweak-test-kitsGradleUp/shadow:g/20241229/tweak-test-kitsCopy head branch name to clipboard