[Observe-commits] 02/02: Fixes #8042 Merge branch 'feature/8042' into develop-4.x