Merge "Update the usage documentation with recent changes"