CLC-2812 - CFV - When Unapplied do something special
https://jira.media.berkeley.edu/jira/browse/CLC-2812
Merge pull request #1802 from christianv/CLC-2812

CLC-2812 - CFV - When Unapplied do something special