Merge "Treat gain as an unsigned int" into main