JIN-23
(and change the version generate script to test if can get rid of the timezone..)