Remove old out-of-date docs.
Properly get uuid.
Merge remote-tracking branch 'origin/develop' into develop