[REFACTOR] refs #35787 @0.4 No more final local variable