## Proposed changes cherry-pick from master (#40299)(#41293) <!--Describe your changes.-->
update on current_timestamp