Merge remote-tracking branch 'refs/remotes/tsyesika/394-fuzzy-timestamp'