CLC-3374-qa - https://jira.ets.berkeley.edu/jira/browse/CLC-3374
https://jira.ets.berkeley.edu/jira/browse/CLC-3374
Merge pull request #2189 from christianv/CLC-3374-qa

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