Variables and values can be 0, which evaluates to false. Fix to allow those.
Merge branch 'fix-csp-variable-value-chequer' into develop