Merge "fix N_SE-22344, TDIS-3124"