Sorry to be a pain, but would you mind removing the additional final keywords that have been added to method signatures and parameters. This isn't a style that has been used for the rest of the codebase, so it takes more cognitive load to try and work out why some methods have final and some don't. It also slows down the reviewing of the code.