Merge "Refactor category and action into a constant to provide more context in a comment." into main