Merge "new config not reflected in TCA processing"