CLC-2677 - CFV Implement the new designs
https://jira.media.berkeley.edu/jira/browse/CLC-2677
Merge pull request #1717 from christianv/CLC-2677-follow

CLC-2677 - CFV Implement the new designs