Merge remote-tracking branch 'origin/support/apply-nextjs-2' into imprv/re-impl-remove-page-redirect-method