Merge pull request #26 from 30x/XAPID-1016

[XAPID-1016] fix unsupported timestamp format