#661 fixed issue where the value 'notset' was being tested for without first casting the value to a string. Also updated all other checks for 'notset' to cast.
Merge branch 't660' into po_ready