Merge "Add new category keys." into pi-dev