ported support for creationDate/terminationDate handling from master