This also makes additional updates where the implementation
had drifted from the approved MSC.

Unstable endpoints will be removed at a later data.