Merge "Make sure to update the selected pages when needed in the right order." into nyc-dev