#2166 [NFR] Archive category
Merge pull request #2204 from xillibit/k31_bugs8

#2166 [NFR] Archive category