Merge "Remove the divider" into pi-dev