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