Merge "Add more comments to the file header to explain the state diagram"