Merge pull request #6572 from RobertSchouten/patch-33

[fix] update timestamps and relink communication for timesheet