Improves code style by adding @override and generic parameters

3 jobs for !72 with f46-new-backend-parallel in 59 seconds (queued for 3 seconds)
latest merge request