Cleanup the following EIP PRs to be able to merge into master, add comments and optimize implementations - [ ] #3382 - [ ] #3394 - [ ] #3380 - [ ] #3399 - [ ] #3376