"Final" version for the core.
It should now see little changes.
Merged to master.