7 Commits (fix/sast)