Merge tofdev with true time into rec hit

Willing to merge gian's development branch into merge-tofdev-with-true-time-into-recHit