CLC-3374-qa - https://jira.ets.berkeley.edu/jira/browse/CLC-3374

https://jira.ets.berkeley.edu/jira/browse/CLC-3374