Mashery LF 3 & fixes to TCO & TCO cats