On experience with 100 subpkgs, this change reduces execution time from 284ms to 4ms Closes: #27137 [via git-merge-pr]