Merge "Match the tutorial documentation more closely"