Merge RC changes to scoripus

[AnjuJose011]

JIRA link

TD-###

Description

Describe what has changed and how that will affect the app. If relevant, add references to the resources you used. Use this as your opportunity to highlight anything odd and give people context around particular decisions.

Screenshots

Attach screenshots on mobile, tablet and desktop.

---

Developer checks

(Leave tasks unticked if they haven't been appropriate for your ticket.)

I have:

• Run the formatter and made sure there are no IDE errors
• Written appropriate unit tests for the changes, including:
  • accessibility tests for new views
  • tests for new controller methods
  • tests for new or modified API endpoints
• Manually tested my work with and without JavaScript
• Tested any Views or partials created or changed with Wave Chrome plugin and addressed any valid accessibility issues
• Updated/added documentation in Confluence and/or GitHub Readme. List of documentation links added/changed:
  • doc_1_here
• Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing is broken
• Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks.