Gh 1573

tested gh-1573 locally and on demo instance ted team.