9 Commits (fix/sast)