CLC-2541 - Act as is not working
https://jira.media.berkeley.edu/jira/browse/CLC-2541
Merge pull request #1571 from christianv/CLC-2541

CLC-2541 - Act as is not working