fixed date error with q25
merged with master