TK-01155. Change for NFE