main
Merge branch 'upstream-at-v3.36.2' into roo-v3.36.2
Also enable "Revert New Changes" for the first Task Completion