Improving update wiki time (Merging into release-25)