Merge fixes from 1.16 to master

Re-worked

| Q                    | A
| -------------------- | ---
| Bug fix?             | Y
| New feature?         | N
| BC breaks?           | Y
| CI currently passes? | Y
| Tests pass?          | Y
| Scenarios pass?      | Y ORM 1634 ODM 427 
| Checkstyle issues?*  | N
| PMD issues?**        | N
| Changelog updated?   | Y
| Fixed tickets        | PIM-3447, PIM-3471, PIM-3369, PIM-3368, PIM-3377, PIM-3458, PIM-3420, PIM-3368, PIM-3448
| DB schema updated?   |
| Migration script?    |
| Doc PR               |