[PR] Merge upstream changes in page builder to allow for section removal