Merge "Avoid triggering BGE scaning multiple times" into main