Merge "Code review feedback" into main