STS-3228: progress towards improved component scanning