https://jira.media.berkeley.edu/jira/browse/CLC-2261

Also included the fix for CLC-2151 - #1395
Otherwise we would have had merge conflicts