TC-1010

https://thirdchannel.atlassian.net/browse/TC-1010