Import the whitespace and last sync from the proposal branch