Merge "Add package name and user id to logging" into main