Merge pull request #2798 from BrzVlad/fix-sgen-timestamp