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