Merge "Add documentation to clarify difference between save and upload message"