Update core from master.
Remove core from combined documentation.

They want it to be standalone.
Update optional from master.