changed !==null to typeof undefined (missed this one)
Merge remote-tracking branch 'upstream/feature/integratedprofile' into feature/integratedprofile
use ISO format internally