Merge "Fix header and footer dividers to match docs"