Simplified tool package detection logic
Simplified tool package detection logic

welelay/gagarin,welelay/gagarin,welelay/gagarin,anticoders/gagarin,anticoders/gagarin,welelay/gagarin,anticoders/gagarin,anticoders/gagarin