TERCHAR-2241

TERCHAR-2241