Found old 'no value is False' style calls, fixing
Merge local develop into develop