Merge pull request #4750 from MartijnKaijser/repotime_extend