ITER Sync 3.2.x to master

- Add files from 3.2.x that were missing in master.
- Remove code that had been removed or renamed.