K3.1 Feature: integrate TFA #2480