#661 added an extra check for conditions which use formulae calculations and might return 'notset'.
Merge branch 't660' into po_ready