Merge "Page rendering not cancelled exception in renderPage" into main