Task #WP-1567 fix date and time