Merge "Improved some headless system user comments."