Merge "Add the rest of the logging types" into main