Optimized checking slots
Merge remote-tracking branch 'origin'