TRUNK-3972 supporting other date formats