Reviewed PR description, comments, commits, and linked issues.
Analyzed relevant source files and code diffs.
Fixed issues and updated the branch.
Confirmed fixes and branch cleanliness.
Merged PR into main and cleaned up branch.
