changes: TINF-175 TZPC-4722