Merge pull request #576 from jonstvns/shader-watch-bulk-scan