adjust timelines

(cherry picked from commit 866166254952e3e032b7e99259f93148ec8f82a3)