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