Bi sync upstream

[adhurjaty]

What this PR does / why we need it:

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #

How this PR was tested:

Screenshots / logs (if relevant):

Special notes for your reviewer:

PR Readiness Checklist:

Complete these before marking the PR as ready to review:

• tests pass locally (mvn test or relevant subset)
• added/updated tests for the changes (if applicable)
• documentation has been updated (if applicable)
• the CHANGELOG.md release notes have been updated to reflect any significant (and particularly user-facing) changes introduced by this PR

[fargo-app]

⚠️ ⚠️ ⚠️ WARNING! ⚠️ ⚠️ ⚠️
Hello fellow developer! Looks like you committed a password.
Remember to keep secrets out of version control. If this was used in production, it needs to be rotated immediately.
If this was used in QA or for unit testing, you can use dynamic passwords.

random_string = SecureRandom.alphanumeric(10)
post sign_in_url, params: { session: { email: 'test1@test.com', password: random_string } }

Please reach out to security in the #fargo-security-alerts Slack channel.

[fargo-app]

⚠️ ⚠️ ⚠️ WARNING! ⚠️ ⚠️ ⚠️
Hello fellow developer! Looks like you committed a password.
Remember to keep secrets out of version control. If this was used in production, it needs to be rotated immediately.
If this was used in QA or for unit testing, you can use dynamic passwords.

random_string = SecureRandom.alphanumeric(10)
post sign_in_url, params: { session: { email: 'test1@test.com', password: random_string } }

Please reach out to security in the #fargo-security-alerts Slack channel.