As requested: changes based of some other branch and commit

I hope this is what you wanted me to do. I sometimes think git always does the right thing magically. Sorry. I made the unit tests compile but they don't succede. Especially date time stuff fails with EInvalidOp.