java.util.Date is treated like java.sql.Timestamp in API
Merge branch 'develop'
5.3-M8-SNAPSHOT