main
Add willRenameFiles support, and an abstraction for extenders to implement (#81549)
Remove unused option
Address PR review feedback