Partial refactor of UID/GID usage to a new struct Upstream-commit: 34536c498d56a0c74fab08bd434407ac4707c971 Component: engine