All the changes done to files that are also inside CE and need to be ported.
- all commits squashed to make danger review happy