Merge branch 'feat/77877-resolve-page-conflict-and-update-it' into feat/77877-78639-select-revision-and-copy-it-to-text-area