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