Merge commit '42b23da99ba0679b40bcd402dcc04266a71e7d30' * commit '42b23da99ba0679b40bcd402dcc04266a71e7d30': Cat: Generalize stk into cat
Merge commit '42b23da99ba0679b40bcd402dcc04266a71e7d30' * commit '42b23da99ba0679b40bcd402dcc04266a71e7d30': Cat: Generalize stk into cat