Fixing merge errors. Checkpoint on manual update.
Checkpoint on user manual.