[Mention the JIRA card and/or GitLab issue that this MR closes]
Test Profile: Test Plan: Test Module: \
Closes OCI-3317