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