Mergeback RC 1.87.0

[demariadaniel]

Link to Issue

Description

Merge back Master -> Develop 1.87.0

Checklist

Type of Change

• [ ] Bug
• [ ] Refactor
• [ ] New Feature
• [x] 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