Mergeback 1.85.0

[demariadaniel]

Description of changes

Master 1.85.0 -> Develop

Type of Change

• [ ] Bug
• [ ] Refactor
• [ ] New Feature
• [ ] Release Candidate

Checklist before requesting review:

• [ ] Check branch (code change PRs go to develop not master)
• [ ] Check copyrights for new files
• [ ] Manual testing
• [ ] Regression tests completed and passing (double check number of tests).
• [ ] Spelling has been checked.
• [ ] Updated swagger docs accordingly (check it's still valid)
• [ ] Set validationDependency in meta tag for Argo Dictionary fields used in code